Merge branch 'master' into maciejk/ar-image-staging

# Conflicts:
#	scripts/release/atomic_pipeline.py
#	scripts/release/build/build_info.py
#	scripts/release/build/build_info_test.py

Author: MaciejKaras

.evergreen-periodic-builds.yaml

@@ -19,148 +19,6 @@ variables:
       - func: switch_context
 
 tasks:
-  - name: periodic_build_operator
-    commands:
-      - func: legacy_pipeline
-        vars:
-          image_name: operator-daily
-
-  - name: periodic_teardown_aws
-    commands:
-      - func: cleanup_aws
-
-  - name: periodic_teardown_cloudqa
-    commands:
-      - func: teardown_cloud_qa_all
-
-  - name: periodic_build_init_appdb
-    commands:
-      - func: legacy_pipeline
-        vars:
-          image_name: init-appdb-daily
-
-  - name: periodic_build_init_database
-    commands:
-      - func: legacy_pipeline
-        vars:
-          image_name: init-database-daily
-
-  - name: periodic_build_init_opsmanager
-    commands:
-      - func: legacy_pipeline
-        vars:
-          image_name: init-ops-manager-daily
-
-  - name: periodic_build_database
-    commands:
-      - func: legacy_pipeline
-        vars:
-          image_name: database-daily
-
-  - name: periodic_build_sbom_cli
-    commands:
-      - func: legacy_pipeline
-        vars:
-          image_name: cli
-
-  - name: periodic_build_ops_manager_6
-    commands:
-      - func: legacy_pipeline
-        vars:
-          image_name: ops-manager-6-daily
-
-  - name: periodic_build_ops_manager_7
-    commands:
-      - func: legacy_pipeline
-        vars:
-          image_name: ops-manager-7-daily
-
-  - name: periodic_build_ops_manager_8
-    commands:
-      - func: legacy_pipeline
-        vars:
-          image_name: ops-manager-8-daily
-
-  # the periodic agent builds are more commented in the pipeline.py file.
-  # The gist is - we want to split up the periodic build on as many machines as possible
-  # To speed up the builds as we have too many agents due to the matrix build.
-  # For now its one without operator suffix and the last 3. This only works as long as we
-  # only have operator versions we support (minor version), as soon as we have multiple patch versions -
-  # this won't work anymore and we will need a dynamic solution.
-  - name: periodic_build_agent
-    exec_timeout_secs: 43200
-    commands:
-      - func: enable_QEMU
-      - func: legacy_pipeline
-        vars:
-          image_name: mongodb-agent-daily
-
-  - name: periodic_build_agent_1
-    exec_timeout_secs: 43200
-    commands:
-      - func: enable_QEMU
-      - func: legacy_pipeline
-        vars:
-          image_name: mongodb-agent-1-daily
-
-  - name: periodic_build_agent_2
-    exec_timeout_secs: 43200
-    commands:
-      - func: enable_QEMU
-      - func: pipeline
-        vars:
-          image_name: mongodb-agent-2-daily
-
-  - name: periodic_build_agent_3
-    exec_timeout_secs: 43200
-    commands:
-      - func: enable_QEMU
-      - func: pipeline
-        vars:
-          image_name: mongodb-agent-3-daily
-
-  #TODO should we still build the community operator?
-  - name: periodic_build_community_operator
-    commands:
-      - func: enable_QEMU
-      - func: legacy_pipeline
-        vars:
-          image_name: mongodb-kubernetes-operator-daily
-
-  - name: periodic_build_readiness_probe
-    commands:
-      - func: legacy_pipeline
-        vars:
-          image_name: readinessprobe-daily
-
-  - name: periodic_build_version_upgrade_post_start_hook
-    commands:
-      - func: legacy_pipeline
-        vars:
-          image_name: operator-version-upgrade-post-start-hook-daily
-
-task_groups:
-  - name: periodic_build_task_group
-    max_hosts: -1
-    <<: *setup_group
-    tasks:
-      - periodic_build_operator
-      - periodic_build_readiness_probe
-      - periodic_build_version_upgrade_post_start_hook
-      - periodic_build_init_appdb
-      - periodic_build_init_database
-      - periodic_build_init_opsmanager
-      - periodic_build_ops_manager_6
-      - periodic_build_ops_manager_7
-      - periodic_build_ops_manager_8
-      - periodic_build_database
-      - periodic_build_community_operator
-      - periodic_build_sbom_cli
-      - periodic_build_agent
-      - periodic_build_agent_1
-      - periodic_build_agent_2
-      - periodic_build_agent_3
-
   - name: periodic_teardown_task_group
     <<: *setup_group
     tasks:
@@ -175,22 +33,3 @@ buildvariants:
       - ubuntu2204-small
     tasks:
       - name: periodic_teardown_task_group
-
-  - name: periodic_build
-    display_name: periodic_build
-    tags: [ "periodic_build" ]
-    run_on:
-      - release-ubuntu2204-large # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
-    tasks:
-      - name: periodic_build_task_group
-
-  - name: preflight_release_images_check_only
-    display_name: preflight_release_images_check_only
-    tags: [ "periodic_build" ]
-    depends_on:
-      - name: "*"
-        variant: periodic_build
-    run_on:
-      - rhel90-large
-    tasks:
-      - name: preflight_images_task_group

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": [
@@ -23,6 +24,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": [
@@ -46,6 +48,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": [
@@ -69,6 +72,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": [
@@ -92,6 +96,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": [
@@ -115,6 +120,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": [
@@ -129,6 +135,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": [
@@ -143,6 +150,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": [
@@ -167,6 +175,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": [
@@ -191,6 +200,7 @@
       }
     },
     "agent": {
+      "dockerfile-path": "docker/mongodb-agent/Dockerfile.atomic",
       "patch": {
         "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi",
         "platforms": [
@@ -213,6 +223,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-ubi",

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,16 +40,13 @@ 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
     tags = [f"{build_configuration.registry}:{build_configuration.version}"]
@@ -59,7 +55,7 @@ def build_image(
 
     execute_docker_build(
         tags=tags,
-        dockerfile=dockerfile_path,
+        dockerfile=build_configuration.dockerfile_path,
         path=build_path,
         args=build_args,
         push=True,
@@ -74,7 +70,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.
     """
@@ -103,7 +99,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",
@@ -116,7 +111,6 @@ def build_mco_tests_image(build_configuration: ImageBuildConfiguration):
     """
 
     build_image(
-        dockerfile_path="docker/mongodb-community-tests/Dockerfile",
         build_configuration=build_configuration,
     )
 
@@ -137,7 +131,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,
     )
@@ -150,7 +143,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,
     )
@@ -201,7 +193,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,
     )
@@ -227,7 +218,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,
     )
@@ -240,7 +230,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,
     )
@@ -254,7 +243,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,
     )
@@ -266,7 +254,6 @@ def build_readiness_probe_image(build_configuration: ImageBuildConfiguration):
     """
 
     build_image(
-        dockerfile_path="docker/mongodb-kubernetes-readinessprobe/Dockerfile.atomic",
         build_configuration=build_configuration,
     )
 
@@ -277,7 +264,6 @@ def build_upgrade_hook_image(build_configuration: ImageBuildConfiguration):
     """
 
     build_image(
-        dockerfile_path="docker/mongodb-kubernetes-upgrade-hook/Dockerfile.atomic",
         build_configuration=build_configuration,
     )
 
@@ -423,7 +409,6 @@ def build_agent_pipeline(
     }
 
     build_image(
-        dockerfile_path="docker/mongodb-agent/Dockerfile.atomic",
         build_configuration=build_configuration_copy,
         build_args=args,
     )