diff --git a/build_info.json b/build_info.json index c84c3bfd6..a38195a86 100644 --- a/build_info.json +++ b/build_info.json @@ -1,6 +1,7 @@ { "images": { "operator": { + "dockerfile-path": "docker/mongodb-kubernetes-operator/Dockerfile.atomic", "patch": { "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes", "platforms": [ @@ -25,6 +26,7 @@ } }, "init-database": { + "dockerfile-path": "docker/mongodb-kubernetes-init-database/Dockerfile.atomic", "patch": { "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-database", "platforms": [ @@ -49,6 +51,7 @@ } }, "init-appdb": { + "dockerfile-path": "docker/mongodb-kubernetes-init-appdb/Dockerfile.atomic", "patch": { "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-appdb", "platforms": [ @@ -73,6 +76,7 @@ } }, "init-ops-manager": { + "dockerfile-path": "docker/mongodb-kubernetes-init-ops-manager/Dockerfile.atomic", "patch": { "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-ops-manager", "platforms": [ @@ -97,6 +101,7 @@ } }, "database": { + "dockerfile-path": "docker/mongodb-kubernetes-database/Dockerfile.atomic", "patch": { "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-database", "platforms": [ @@ -121,6 +126,7 @@ } }, "meko-tests": { + "dockerfile-path": "docker/mongodb-kubernetes-tests/Dockerfile", "patch": { "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests", "platforms": [ @@ -135,6 +141,7 @@ } }, "mco-tests": { + "dockerfile-path": "docker/mongodb-community-tests/Dockerfile", "patch": { "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-community-tests", "platforms": [ @@ -149,6 +156,7 @@ } }, "readiness-probe": { + "dockerfile-path": "docker/mongodb-kubernetes-readinessprobe/Dockerfile.atomic", "patch": { "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-readinessprobe", "platforms": [ @@ -174,6 +182,7 @@ } }, "upgrade-hook": { + "dockerfile-path": "docker/mongodb-kubernetes-upgrade-hook/Dockerfile.atomic", "patch": { "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-operator-version-upgrade-post-start-hook", "platforms": [ @@ -199,6 +208,7 @@ } }, "agent": { + "dockerfile-path": "docker/mongodb-agent/Dockerfile.atomic", "patch": { "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi", "platforms": [ @@ -223,6 +233,7 @@ } }, "ops-manager": { + "dockerfile-path": "docker/mongodb-enterprise-ops-manager/Dockerfile.atomic", "patch": { "version": "om-version-from-release.json", "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-enterprise-ops-manager", diff --git a/scripts/release/atomic_pipeline.py b/scripts/release/atomic_pipeline.py index 88eab5754..45209580f 100755 --- a/scripts/release/atomic_pipeline.py +++ b/scripts/release/atomic_pipeline.py @@ -29,7 +29,6 @@ @TRACER.start_as_current_span("build_image") def build_image( - dockerfile_path: str, build_configuration: ImageBuildConfiguration, build_args: Dict[str, str] = None, build_path: str = ".", @@ -41,23 +40,24 @@ def build_image( span = trace.get_current_span() span.set_attribute("mck.image_name", image_name) - registry = build_configuration.base_registry + base_registry = build_configuration.base_registry() build_args = build_args or {} if build_args: span.set_attribute("mck.build_args", str(build_args)) - - logger.info(f"Building {image_name}, dockerfile args: {build_args}") - logger.debug(f"Build args: {build_args}") - logger.debug(f"Building {image_name} for platforms={build_configuration.platforms}") - logger.debug(f"build image generic - registry={registry}") + span.set_attribute("mck.registry", base_registry) + span.set_attribute("mck.platforms", build_configuration.platforms) # Build docker registry URI and call build_image image_full_uri = f"{build_configuration.registry}:{build_configuration.version}" + logger.info( + f"Building {image_full_uri} for platforms={build_configuration.platforms}, dockerfile args: {build_args}" + ) + execute_docker_build( tag=image_full_uri, - dockerfile=dockerfile_path, + dockerfile=build_configuration.dockerfile_path, path=build_path, args=build_args, push=True, @@ -72,7 +72,7 @@ def build_image( verify_signature(build_configuration.registry, build_configuration.version) -def build_tests_image(build_configuration: ImageBuildConfiguration): +def build_meko_tests_image(build_configuration: ImageBuildConfiguration): """ Builds image used to run tests. """ @@ -101,7 +101,6 @@ def build_tests_image(build_configuration: ImageBuildConfiguration): build_args = dict({"PYTHON_VERSION": python_version}) build_image( - dockerfile_path="docker/mongodb-kubernetes-tests/Dockerfile", build_configuration=build_configuration, build_args=build_args, build_path="docker/mongodb-kubernetes-tests", @@ -114,7 +113,6 @@ def build_mco_tests_image(build_configuration: ImageBuildConfiguration): """ build_image( - dockerfile_path="docker/mongodb-community-tests/Dockerfile", build_configuration=build_configuration, ) @@ -135,7 +133,6 @@ def build_operator_image(build_configuration: ImageBuildConfiguration): logger.info(f"Building Operator args: {args}") build_image( - dockerfile_path="docker/mongodb-kubernetes-operator/Dockerfile.atomic", build_configuration=build_configuration, build_args=args, ) @@ -148,7 +145,6 @@ def build_database_image(build_configuration: ImageBuildConfiguration): args = {"version": build_configuration.version} build_image( - dockerfile_path="docker/mongodb-kubernetes-database/Dockerfile.atomic", build_configuration=build_configuration, build_args=args, ) @@ -199,7 +195,6 @@ def build_init_om_image(build_configuration: ImageBuildConfiguration): args = {"version": build_configuration.version} build_image( - dockerfile_path="docker/mongodb-kubernetes-init-ops-manager/Dockerfile.atomic", build_configuration=build_configuration, build_args=args, ) @@ -225,7 +220,6 @@ def build_om_image(build_configuration: ImageBuildConfiguration): } build_image( - dockerfile_path="docker/mongodb-enterprise-ops-manager/Dockerfile.atomic", build_configuration=build_configuration, build_args=args, ) @@ -238,7 +232,6 @@ def build_init_appdb_image(build_configuration: ImageBuildConfiguration): args = {"version": build_configuration.version, "mongodb_tools_url_ubi": mongodb_tools_url_ubi} build_image( - dockerfile_path="docker/mongodb-kubernetes-init-appdb/Dockerfile.atomic", build_configuration=build_configuration, build_args=args, ) @@ -252,7 +245,6 @@ def build_init_database_image(build_configuration: ImageBuildConfiguration): args = {"version": build_configuration.version, "mongodb_tools_url_ubi": mongodb_tools_url_ubi} build_image( - "docker/mongodb-kubernetes-init-database/Dockerfile.atomic", build_configuration=build_configuration, build_args=args, ) @@ -264,7 +256,6 @@ def build_readiness_probe_image(build_configuration: ImageBuildConfiguration): """ build_image( - dockerfile_path="docker/mongodb-kubernetes-readinessprobe/Dockerfile.atomic", build_configuration=build_configuration, ) @@ -275,7 +266,6 @@ def build_upgrade_hook_image(build_configuration: ImageBuildConfiguration): """ build_image( - dockerfile_path="docker/mongodb-kubernetes-upgrade-hook/Dockerfile.atomic", build_configuration=build_configuration, ) @@ -425,7 +415,6 @@ def build_agent_pipeline( } build_image( - dockerfile_path="docker/mongodb-agent/Dockerfile.atomic", build_configuration=build_configuration_copy, build_args=args, ) diff --git a/scripts/release/build/build_info.py b/scripts/release/build/build_info.py index 010f73e80..5594574c2 100644 --- a/scripts/release/build/build_info.py +++ b/scripts/release/build/build_info.py @@ -24,6 +24,7 @@ class ImageInfo: repository: str platforms: list[str] version: str + dockerfile_path: str sign: bool @@ -81,49 +82,50 @@ def load_build_info(scenario: BuildScenario, build_info_scenario = BuildScenario.PATCH images = {} - for name, env_data in build_info["images"].items(): - data = env_data.get(build_info_scenario) - if not data: - # If no data is available for the scenario, skip this image + for name, data in build_info["images"].items(): + scenario_data = data.get(build_info_scenario) + if not scenario_data: + # If no scenario_data is available for the scenario, skip this image continue # Only update the image_version if it is not already set in the build_info.json file - image_version = data.get("version") + image_version = scenario_data.get("version") if not image_version: image_version = version images[name] = ImageInfo( - repository=data["repository"], - platforms=data["platforms"], + repository=scenario_data["repository"], + platforms=scenario_data["platforms"], version=image_version, - sign=data.get("sign", False), + dockerfile_path=data["dockerfile-path"], + sign=scenario_data.get("sign", False), ) binaries = {} - for name, env_data in build_info["binaries"].items(): - data = env_data.get(build_info_scenario) - if not data: - # If no data is available for the scenario, skip this binary + for name, data in build_info["binaries"].items(): + scenario_data = data.get(build_info_scenario) + if not scenario_data: + # If no scenario_data is available for the scenario, skip this binary continue binaries[name] = BinaryInfo( - s3_store=data["s3-store"], - platforms=data["platforms"], + s3_store=scenario_data["s3-store"], + platforms=scenario_data["platforms"], version=version, - sign=data.get("sign", False), + sign=scenario_data.get("sign", False), ) helm_charts = {} - for name, env_data in build_info["helm-charts"].items(): - data = env_data.get(build_info_scenario) - if not data: - # If no data is available for the scenario, skip this helm-chart + for name, data in build_info["helm-charts"].items(): + scenario_data = data.get(build_info_scenario) + if not scenario_data: + # If no scenario_data is available for the scenario, skip this helm-chart continue helm_charts[name] = HelmChartInfo( - repository=data["repository"], + repository=scenario_data["repository"], version=version, - sign=data.get("sign", False), + sign=scenario_data.get("sign", False), ) return BuildInfo(images=images, binaries=binaries, helm_charts=helm_charts) diff --git a/scripts/release/build/build_info_test.py b/scripts/release/build/build_info_test.py index 0b870cc5b..66e7da3fd 100644 --- a/scripts/release/build/build_info_test.py +++ b/scripts/release/build/build_info_test.py @@ -11,6 +11,7 @@ ) from scripts.release.build.build_scenario import BuildScenario + def test_load_build_info_development(git_repo: Repo): version = "latest" @@ -20,66 +21,77 @@ def test_load_build_info_development(git_repo: Repo): repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes", platforms=["linux/amd64"], version=version, + dockerfile_path="docker/mongodb-kubernetes-operator/Dockerfile.atomic", sign=False, ), "init-database": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-database", platforms=["linux/amd64"], version=version, + dockerfile_path="docker/mongodb-kubernetes-init-database/Dockerfile.atomic", sign=False, ), "init-appdb": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-appdb", platforms=["linux/amd64"], version=version, + dockerfile_path="docker/mongodb-kubernetes-init-appdb/Dockerfile.atomic", sign=False, ), "init-ops-manager": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-ops-manager", platforms=["linux/amd64"], version=version, + dockerfile_path="docker/mongodb-kubernetes-init-ops-manager/Dockerfile.atomic", sign=False, ), "database": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-database", platforms=["linux/amd64"], version=version, + dockerfile_path="docker/mongodb-kubernetes-database/Dockerfile.atomic", sign=False, ), "mco-tests": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-community-tests", platforms=["linux/amd64"], version=version, + dockerfile_path="docker/mongodb-community-tests/Dockerfile", sign=False, ), "meko-tests": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests", platforms=["linux/amd64"], version=version, + dockerfile_path="docker/mongodb-kubernetes-tests/Dockerfile", sign=False, ), "readiness-probe": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-readinessprobe", platforms=["linux/amd64"], version=version, + dockerfile_path="docker/mongodb-kubernetes-readinessprobe/Dockerfile.atomic", sign=False, ), "upgrade-hook": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-operator-version-upgrade-post-start-hook", platforms=["linux/amd64"], version=version, + dockerfile_path="docker/mongodb-kubernetes-upgrade-hook/Dockerfile.atomic", sign=False, ), "agent": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi", platforms=["linux/amd64"], version=version, + dockerfile_path="docker/mongodb-agent/Dockerfile.atomic", sign=False, ), "ops-manager": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-enterprise-ops-manager", platforms=["linux/amd64"], version="om-version-from-release.json", + dockerfile_path="docker/mongodb-enterprise-ops-manager/Dockerfile.atomic", sign=False, ), }, @@ -115,66 +127,77 @@ def test_load_build_info_patch(git_repo: Repo): repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes", platforms=["linux/amd64"], version=patch_id, + dockerfile_path="docker/mongodb-kubernetes-operator/Dockerfile.atomic", sign=False, ), "init-database": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-database", platforms=["linux/amd64"], version=patch_id, + dockerfile_path="docker/mongodb-kubernetes-init-database/Dockerfile.atomic", sign=False, ), "init-appdb": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-appdb", platforms=["linux/amd64"], version=patch_id, + dockerfile_path="docker/mongodb-kubernetes-init-appdb/Dockerfile.atomic", sign=False, ), "init-ops-manager": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-ops-manager", platforms=["linux/amd64"], version=patch_id, + dockerfile_path="docker/mongodb-kubernetes-init-ops-manager/Dockerfile.atomic", sign=False, ), "database": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-database", platforms=["linux/amd64"], version=patch_id, + dockerfile_path="docker/mongodb-kubernetes-database/Dockerfile.atomic", sign=False, ), "mco-tests": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-community-tests", platforms=["linux/amd64"], version=patch_id, + dockerfile_path="docker/mongodb-community-tests/Dockerfile", sign=False, ), "meko-tests": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-tests", platforms=["linux/amd64"], version=patch_id, + dockerfile_path="docker/mongodb-kubernetes-tests/Dockerfile", sign=False, ), "readiness-probe": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-readinessprobe", platforms=["linux/amd64"], version=patch_id, + dockerfile_path="docker/mongodb-kubernetes-readinessprobe/Dockerfile.atomic", sign=False, ), "upgrade-hook": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-operator-version-upgrade-post-start-hook", platforms=["linux/amd64"], version=patch_id, + dockerfile_path="docker/mongodb-kubernetes-upgrade-hook/Dockerfile.atomic", sign=False, ), "agent": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi", platforms=["linux/amd64"], version=patch_id, + dockerfile_path="docker/mongodb-agent/Dockerfile.atomic", sign=False, ), "ops-manager": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-enterprise-ops-manager", platforms=["linux/amd64"], version="om-version-from-release.json", + dockerfile_path="docker/mongodb-enterprise-ops-manager/Dockerfile.atomic", sign=False, ), }, @@ -211,66 +234,77 @@ def test_load_build_info_staging(git_repo: Repo): repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes", platforms=["linux/arm64", "linux/amd64"], version=expecter_commit_sha, + dockerfile_path="docker/mongodb-kubernetes-operator/Dockerfile.atomic", sign=True, ), "init-database": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-database", platforms=["linux/arm64", "linux/amd64"], version=expecter_commit_sha, + dockerfile_path="docker/mongodb-kubernetes-init-database/Dockerfile.atomic", sign=True, ), "init-appdb": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-appdb", platforms=["linux/arm64", "linux/amd64"], version=expecter_commit_sha, + dockerfile_path="docker/mongodb-kubernetes-init-appdb/Dockerfile.atomic", sign=True, ), "init-ops-manager": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-ops-manager", platforms=["linux/arm64", "linux/amd64"], version=expecter_commit_sha, + dockerfile_path="docker/mongodb-kubernetes-init-ops-manager/Dockerfile.atomic", sign=True, ), "database": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-database", platforms=["linux/arm64", "linux/amd64"], version=expecter_commit_sha, + dockerfile_path="docker/mongodb-kubernetes-database/Dockerfile.atomic", sign=True, ), "mco-tests": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-community-tests", platforms=["linux/amd64"], version=expecter_commit_sha, + dockerfile_path="docker/mongodb-community-tests/Dockerfile", sign=False, ), "meko-tests": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-tests", platforms=["linux/amd64"], version=expecter_commit_sha, + dockerfile_path="docker/mongodb-kubernetes-tests/Dockerfile", sign=False, ), "readiness-probe": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-readinessprobe", platforms=["linux/arm64", "linux/amd64"], version=expecter_commit_sha, + dockerfile_path="docker/mongodb-kubernetes-readinessprobe/Dockerfile.atomic", sign=True, ), "upgrade-hook": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-operator-version-upgrade-post-start-hook", platforms=["linux/arm64", "linux/amd64"], version=expecter_commit_sha, + dockerfile_path="docker/mongodb-kubernetes-upgrade-hook/Dockerfile.atomic", sign=True, ), "agent": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent-ubi", platforms=["linux/arm64", "linux/amd64"], version=expecter_commit_sha, + dockerfile_path="docker/mongodb-agent/Dockerfile.atomic", sign=True, ), "ops-manager": ImageInfo( repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-enterprise-ops-manager", platforms=["linux/amd64"], version="om-version-from-release.json", + dockerfile_path="docker/mongodb-enterprise-ops-manager/Dockerfile.atomic", sign=True, ), }, @@ -307,54 +341,63 @@ def test_load_build_info_release(git_repo: Repo, readinessprobe_version: str, repository="quay.io/mongodb/mongodb-kubernetes", platforms=["linux/arm64", "linux/amd64"], version=version, + dockerfile_path="docker/mongodb-kubernetes-operator/Dockerfile.atomic", sign=True, ), "init-database": ImageInfo( repository="quay.io/mongodb/mongodb-kubernetes-init-database", platforms=["linux/arm64", "linux/amd64"], version=version, + dockerfile_path="docker/mongodb-kubernetes-init-database/Dockerfile.atomic", sign=True, ), "init-appdb": ImageInfo( repository="quay.io/mongodb/mongodb-kubernetes-init-appdb", platforms=["linux/arm64", "linux/amd64"], version=version, + dockerfile_path="docker/mongodb-kubernetes-init-appdb/Dockerfile.atomic", sign=True, ), "init-ops-manager": ImageInfo( repository="quay.io/mongodb/mongodb-kubernetes-init-ops-manager", platforms=["linux/arm64", "linux/amd64"], version=version, + dockerfile_path="docker/mongodb-kubernetes-init-ops-manager/Dockerfile.atomic", sign=True, ), "database": ImageInfo( repository="quay.io/mongodb/mongodb-kubernetes-database", platforms=["linux/arm64", "linux/amd64"], version=version, + dockerfile_path="docker/mongodb-kubernetes-database/Dockerfile.atomic", sign=True, ), "readiness-probe": ImageInfo( repository="quay.io/mongodb/mongodb-kubernetes-readinessprobe", platforms=["linux/arm64", "linux/amd64"], version=readinessprobe_version, + dockerfile_path="docker/mongodb-kubernetes-readinessprobe/Dockerfile.atomic", sign=True, ), "upgrade-hook": ImageInfo( repository="quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook", platforms=["linux/arm64", "linux/amd64"], version=operator_version_upgrade_post_start_hook_version, + dockerfile_path="docker/mongodb-kubernetes-upgrade-hook/Dockerfile.atomic", sign=True, ), "agent": ImageInfo( repository="quay.io/mongodb/mongodb-agent-ubi", platforms=["linux/arm64", "linux/amd64"], version=version, + dockerfile_path="docker/mongodb-agent/Dockerfile.atomic", sign=True, ), "ops-manager": ImageInfo( repository="quay.io/mongodb/mongodb-enterprise-ops-manager", platforms=["linux/amd64"], version="om-version-from-release.json", + dockerfile_path="docker/mongodb-enterprise-ops-manager/Dockerfile.atomic", sign=True, ), }, diff --git a/scripts/release/build/image_build_configuration.py b/scripts/release/build/image_build_configuration.py index 5eb497759..97ca7ebb5 100644 --- a/scripts/release/build/image_build_configuration.py +++ b/scripts/release/build/image_build_configuration.py @@ -11,6 +11,7 @@ class ImageBuildConfiguration: scenario: BuildScenario version: str registry: str + dockerfile_path: str parallel: bool = False parallel_factor: int = 0 diff --git a/scripts/release/build/image_build_process.py b/scripts/release/build/image_build_process.py index 48c283cc0..93c3a53d1 100644 --- a/scripts/release/build/image_build_process.py +++ b/scripts/release/build/image_build_process.py @@ -90,6 +90,7 @@ def execute_docker_build( :param args: Build arguments dictionary :param push: Whether to push the image after building :param platforms: List of target platforms (e.g., ["linux/amd64", "linux/arm64"]) + :param builder_name: Name of the buildx builder to use """ # Login to ECR before building # TODO CLOUDP-335471: use env variables to configure AWS region and account ID diff --git a/scripts/release/pipeline_main.py b/scripts/release/pipeline_main.py index 3e2ff736b..d929a9951 100644 --- a/scripts/release/pipeline_main.py +++ b/scripts/release/pipeline_main.py @@ -22,10 +22,10 @@ build_init_database_image, build_init_om_image, build_mco_tests_image, + build_meko_tests_image, build_om_image, build_operator_image, build_readiness_probe_image, - build_tests_image, build_upgrade_hook_image, ) from scripts.release.build.build_info import ( @@ -65,7 +65,7 @@ def get_builder_function_for_image_name() -> Dict[str, Callable]: """Returns a dictionary of image names that can be built.""" image_builders = { - MEKO_TESTS_IMAGE: build_tests_image, + MEKO_TESTS_IMAGE: build_meko_tests_image, OPERATOR_IMAGE: build_operator_image, MCO_TESTS_IMAGE: build_mco_tests_image, READINESS_PROBE_IMAGE: build_readiness_probe_image, @@ -110,11 +110,13 @@ def image_build_config_from_args(args) -> ImageBuildConfiguration: registry = args.registry or image_build_info.repository platforms = get_platforms_from_arg(args.platform) or image_build_info.platforms sign = args.sign or image_build_info.sign + dockerfile_path = image_build_info.dockerfile_path return ImageBuildConfiguration( scenario=build_scenario, version=version, registry=registry, + dockerfile_path=dockerfile_path, parallel=args.parallel, platforms=platforms, sign=sign,