CLOUDP-295785 - staging support for image building

build_info.json

@@ -12,15 +12,13 @@
         "sign": true,
         "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes",
         "platforms": [
-          "linux/arm64",
           "linux/amd64"
         ]
       },
       "release": {
         "sign": true,
         "repository": "quay.io/mongodb/mongodb-kubernetes",
         "platforms": [
-          "linux/arm64",
           "linux/amd64"
         ]
       }
@@ -35,17 +33,16 @@
       },
       "staging": {
         "sign": true,
+        "latest-tag": true,
         "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-database",
         "platforms": [
-          "linux/arm64",
           "linux/amd64"
         ]
       },
       "release": {
         "sign": true,
         "repository": "quay.io/mongodb/mongodb-kubernetes-init-database",
         "platforms": [
-          "linux/arm64",
           "linux/amd64"
         ]
       }
@@ -60,17 +57,16 @@
       },
       "staging": {
         "sign": true,
+        "latest-tag": true,
         "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-appdb",
         "platforms": [
-          "linux/arm64",
           "linux/amd64"
         ]
       },
       "release": {
         "sign": true,
         "repository": "quay.io/mongodb/mongodb-kubernetes-init-appdb",
         "platforms": [
-          "linux/arm64",
           "linux/amd64"
         ]
       }
@@ -85,17 +81,16 @@
       },
       "staging": {
         "sign": true,
+        "latest-tag": true,
         "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-init-ops-manager",
         "platforms": [
-          "linux/arm64",
           "linux/amd64"
         ]
       },
       "release": {
         "sign": true,
         "repository": "quay.io/mongodb/mongodb-kubernetes-init-ops-manager",
         "platforms": [
-          "linux/arm64",
           "linux/amd64"
         ]
       }
@@ -110,17 +105,16 @@
       },
       "staging": {
         "sign": true,
+        "latest-tag": true,
         "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-database",
         "platforms": [
-          "linux/arm64",
           "linux/amd64"
         ]
       },
       "release": {
         "sign": true,
         "repository": "quay.io/mongodb/mongodb-kubernetes-database",
         "platforms": [
-          "linux/arm64",
           "linux/amd64"
         ]
       }
@@ -165,9 +159,9 @@
       },
       "staging": {
         "sign": true,
+        "latest-tag": true,
         "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-readinessprobe",
         "platforms": [
-          "linux/arm64",
           "linux/amd64"
         ]
       },
@@ -176,7 +170,6 @@
         "sign": true,
         "repository": "quay.io/mongodb/mongodb-kubernetes-readinessprobe",
         "platforms": [
-          "linux/arm64",
           "linux/amd64"
         ]
       }
@@ -191,9 +184,9 @@
       },
       "staging": {
         "sign": true,
+        "latest-tag": true,
         "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-kubernetes-operator-version-upgrade-post-start-hook",
         "platforms": [
-          "linux/arm64",
           "linux/amd64"
         ]
       },
@@ -202,7 +195,6 @@
         "sign": true,
         "repository": "quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook",
         "platforms": [
-          "linux/arm64",
           "linux/amd64"
         ]
       }
@@ -219,15 +211,13 @@
         "sign": true,
         "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent-ubi",
         "platforms": [
-          "linux/arm64",
           "linux/amd64"
         ]
       },
       "release": {
         "sign": true,
         "repository": "quay.io/mongodb/mongodb-agent-ubi",
         "platforms": [
-          "linux/arm64",
           "linux/amd64"
         ]
       }
@@ -236,23 +226,23 @@
       "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",
+        "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-enterprise-ops-manager-ubi",
         "platforms": [
           "linux/amd64"
         ]
       },
       "staging": {
         "version": "om-version-from-release.json",
         "sign": true,
-        "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-enterprise-ops-manager",
+        "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-enterprise-ops-manager-ubi",
         "platforms": [
           "linux/amd64"
         ]
       },
       "release": {
         "version": "om-version-from-release.json",
         "sign": true,
-        "repository": "quay.io/mongodb/mongodb-enterprise-ops-manager",
+        "repository": "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi",
         "platforms": [
           "linux/amd64"
         ]

scripts/dev/contexts/e2e_mdb_kind_ubi_cloudqa

@@ -10,7 +10,7 @@ source "${script_dir}/root-context"
 export ops_manager_version="cloud_qa"
 
 # This is required to be able to rebuild the om image and use that image which has been rebuild
-export OPS_MANAGER_REGISTRY=268558157000.dkr.ecr.us-east-1.amazonaws.com/dev
+export OPS_MANAGER_REGISTRY="${BASE_REPO_URL}"
 CUSTOM_OM_VERSION=$(grep -E "^\s*-\s*&ops_manager_70_latest\s+(\S+)\s+#" <"${script_dir}"/../../../.evergreen.yml | awk '{print $3}')
 export CUSTOM_OM_VERSION
 

scripts/dev/contexts/e2e_static_mdb_kind_ubi_cloudqa

@@ -11,7 +11,7 @@ export ops_manager_version="cloud_qa"
 export MDB_DEFAULT_ARCHITECTURE=static
 
 # This is required to be able to rebuild the om image and use that image which has been rebuild
-export OPS_MANAGER_REGISTRY=268558157000.dkr.ecr.us-east-1.amazonaws.com/dev
+export OPS_MANAGER_REGISTRY="${BASE_REPO_URL}"
 CUSTOM_OM_VERSION=$(grep -E "^\s*-\s*&ops_manager_70_latest\s+(\S+)\s+#" <"${script_dir}"/../../../.evergreen.yml | awk '{print $3}')
 export CUSTOM_OM_VERSION
 

scripts/dev/contexts/evg-private-context

@@ -33,7 +33,19 @@ else
 fi
 export NAMESPACE
 
-export BASE_REPO_URL="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev"
+DEV_REPO_URL="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev"
+STAGING_REPO_URL="268558157000.dkr.ecr.us-east-1.amazonaws.com/staging"
+COMMIT_SHA_SHORT=$(git rev-parse --short=8 HEAD)
+
+if [ "${is_patch:-false}" = "true" ]; then
+  echo "is_patch is set, setting BASE_REPO_URL=${STAGING_REPO_URL}"
+  export BASE_REPO_URL="${STAGING_REPO_URL}"
+  export OVERRIDE_VERSION_ID="${COMMIT_SHA_SHORT}"
+else
+  echo "is_patch is not set, setting BASE_REPO_URL=${STAGING_REPO_URL}, OVERRIDE_VERSION_ID=${COMMIT_SHA_SHORT}"
+  export BASE_REPO_URL="${STAGING_REPO_URL}"
+  export OVERRIDE_VERSION_ID="${COMMIT_SHA_SHORT}"
+fi
 
 export REGISTRY="${BASE_REPO_URL}"
 export QUAY_REGISTRY=quay.io/mongodb
@@ -107,8 +119,8 @@ export CODE_SNIPPETS_COMMIT_OUTPUT=${code_snippets_commit_output:-"false"}
 
 # MCO
 # shellcheck disable=SC2154
-export READINESS_PROBE_IMAGE="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-readinessprobe:${version_id}"
-export VERSION_UPGRADE_HOOK_IMAGE="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-operator-version-upgrade-post-start-hook:${version_id}"
+export READINESS_PROBE_IMAGE="${REGISTRY}/mongodb-kubernetes-readinessprobe:${version_id}"
+export VERSION_UPGRADE_HOOK_IMAGE="${REGISTRY}/mongodb-kubernetes-operator-version-upgrade-post-start-hook:${version_id}"
 
 # TODO to be removed at public preview stage of community-search
 export COMMUNITY_PRIVATE_PREVIEW_PULLSECRET_DOCKERCONFIGJSON="${community_private_preview_pullsecret_dockerconfigjson}"

scripts/dev/contexts/local-defaults-context

@@ -41,7 +41,7 @@ export MONGODB_ENTERPRISE_DATABASE_IMAGE="${INIT_IMAGES_REGISTRY}/mongodb-kubern
 export MDB_AGENT_IMAGE_OPERATOR_VERSION=latest
 export MDB_AGENT_IMAGE_REPOSITORY="${BASE_REPO_URL_SHARED}/mongodb-agent-ubi"
 export AGENT_BASE_REGISTRY=${BASE_REPO_URL_SHARED}
-export AGENT_IMAGE="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi:12.0.30.7791-1"
+export AGENT_IMAGE="${AGENT_BASE_REGISTRY}/mongodb-agent-ubi:12.0.30.7791-1"
 
 # these are needed to deploy OM
 export INIT_APPDB_IMAGE_REPOSITORY="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-init-appdb"

scripts/dev/contexts/variables/om60

@@ -13,10 +13,10 @@ export CUSTOM_OM_VERSION
 export CUSTOM_MDB_VERSION=6.0.21
 export CUSTOM_MDB_PREV_VERSION=5.0.7
 
-export AGENT_VERSION=12.0.33.7866-1
+export AGENT_VERSION=12.0.34.7888-1
 export AGENT_IMAGE="${MDB_AGENT_IMAGE_REPOSITORY}:${AGENT_VERSION}"
 
 export CUSTOM_APPDB_VERSION=6.0.21-ent
 export TEST_MODE=opsmanager
-export OPS_MANAGER_REGISTRY=268558157000.dkr.ecr.us-east-1.amazonaws.com/dev
-export APPDB_REGISTRY=268558157000.dkr.ecr.us-east-1.amazonaws.com/dev
+export OPS_MANAGER_REGISTRY="${BASE_REPO_URL}"
+export APPDB_REGISTRY="${BASE_REPO_URL}"

scripts/dev/contexts/variables/om70

@@ -18,5 +18,5 @@ export AGENT_IMAGE="${MDB_AGENT_IMAGE_REPOSITORY}:${AGENT_VERSION}"
 
 export CUSTOM_APPDB_VERSION=7.0.18-ent
 export TEST_MODE=opsmanager
-export OPS_MANAGER_REGISTRY=268558157000.dkr.ecr.us-east-1.amazonaws.com/dev
-export APPDB_REGISTRY=268558157000.dkr.ecr.us-east-1.amazonaws.com/dev
+export OPS_MANAGER_REGISTRY="${BASE_REPO_URL}"
+export APPDB_REGISTRY="${BASE_REPO_URL}"

scripts/dev/contexts/variables/om80

@@ -18,5 +18,5 @@ export AGENT_IMAGE="${MDB_AGENT_IMAGE_REPOSITORY}:${AGENT_VERSION}"
 
 export CUSTOM_APPDB_VERSION=8.0.6-ent
 export TEST_MODE=opsmanager
-export OPS_MANAGER_REGISTRY=268558157000.dkr.ecr.us-east-1.amazonaws.com/dev
-export APPDB_REGISTRY=268558157000.dkr.ecr.us-east-1.amazonaws.com/dev
+export OPS_MANAGER_REGISTRY="${BASE_REPO_URL}"
+export APPDB_REGISTRY="${BASE_REPO_URL}"

scripts/release/atomic_pipeline.py

@@ -49,14 +49,12 @@ def build_image(
     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}"
-    )
+    tags = [f"{build_configuration.registry}:{build_configuration.version}"]
+    if build_configuration.latest_tag:
+        tags.append(f"{build_configuration.registry}:{"latest"}")
 
     execute_docker_build(
-        tag=image_full_uri,
+        tags=tags,
         dockerfile=build_configuration.dockerfile_path,
         path=build_path,
         args=build_args,

scripts/release/build/build_info.py

@@ -26,6 +26,7 @@ class ImageInfo:
     version: str
     dockerfile_path: str
     sign: bool
+    latest_tag: bool
 
 
 @dataclass
@@ -98,7 +99,8 @@ def load_build_info(scenario: BuildScenario,
             platforms=scenario_data["platforms"],
             version=image_version,
             dockerfile_path=data["dockerfile-path"],
-            sign=scenario_data.get("sign", False),
+            sign=data.get("sign", False),
+            latest_tag=data.get("latest-tag", False),
         )
 
     binaries = {}