Add agent and ops-manager to build_info.json

Author: MaciejKaras

build_info.json

@@ -197,6 +197,42 @@
           "linux/amd64"
         ]
       }
+    },
+    "agent": {
+      "patch": {
+        "version": "agent-version-from-release.json",
+        "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi",
+        "platforms": [
+          "linux/amd64"
+        ]
+      },
+      "staging": {
+        "version": "agent-version-from-release.json",
+        "sign": true,
+        "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent-ubi",
+        "platforms": [
+          "linux/arm64",
+          "linux/amd64"
+        ]
+      }
+    },
+    "ops-manager": {
+      "patch": {
+        "version": "om-version-from-release.json",
+        "repository": "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-enterprise-ops-manager",
+        "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",
+        "platforms": [
+          "linux/arm64",
+          "linux/amd64"
+        ]
+      }
     }
   },
   "binaries": {

scripts/release/atomic_pipeline.py

@@ -233,6 +233,9 @@ def build_om_image(build_configuration: ImageBuildConfiguration):
     if om_version is None:
         raise ValueError("`om_version` should be defined.")
 
+    # Set the version in the build configuration (it is not provided in the build_configuration)
+    build_configuration.version = om_version
+
     om_download_url = os.environ.get("om_download_url", "")
     if om_download_url == "":
         om_download_url = find_om_url(om_version)
@@ -249,7 +252,7 @@ def build_om_image(build_configuration: ImageBuildConfiguration):
     )
 
 
-def build_init_appdb(build_configuration: ImageBuildConfiguration):
+def build_init_appdb_image(build_configuration: ImageBuildConfiguration):
     release = load_release_file()
     base_url = "https://fastdl.mongodb.org/tools/db/"
     mongodb_tools_url_ubi = "{}{}".format(base_url, release["mongodbToolsBundle"]["ubi"])
@@ -263,7 +266,7 @@ def build_init_appdb(build_configuration: ImageBuildConfiguration):
 
 
 # TODO: nam static: remove this once static containers becomes the default
-def build_init_database(build_configuration: ImageBuildConfiguration):
+def build_init_database_image(build_configuration: ImageBuildConfiguration):
     release = load_release_file()
     base_url = "https://fastdl.mongodb.org/tools/db/"
     mongodb_tools_url_ubi = "{}{}".format(base_url, release["mongodbToolsBundle"]["ubi"])
@@ -329,12 +332,10 @@ def build_agent_pipeline(
     args = {
         "version": image_version,
         "agent_version": agent_version,
-        "ubi_suffix": "-ubi",
         "release_version": image_version,
         "init_database_image": init_database_image,
         "mongodb_tools_url_ubi": mongodb_tools_url_ubi,
         "mongodb_agent_url_ubi": mongodb_agent_url_ubi,
-        "quay_registry": build_configuration_copy.registry,
     }
 
     pipeline_process_image(

scripts/release/build/build_info_test.py

@@ -71,6 +71,18 @@ def test_load_build_info_patch(git_repo: Repo):
                 version=patch_id,
                 sign=False,
             ),
+            "agent": ImageInfo(
+                repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi",
+                platforms=["linux/amd64"],
+                version="agent-version-from-release.json",
+                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",
+                sign=False,
+            ),
         },
         binaries={
             "kubectl-mongodb": BinaryInfo(
@@ -155,6 +167,18 @@ def test_load_build_info_staging(git_repo: Repo):
                 version=expecter_commit_sha,
                 sign=True,
             ),
+            "agent": ImageInfo(
+                repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent-ubi",
+                platforms=["linux/arm64", "linux/amd64"],
+                version="agent-version-from-release.json",
+                sign=True,
+            ),
+            "ops-manager": ImageInfo(
+                repository="268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-enterprise-ops-manager",
+                platforms=["linux/arm64", "linux/amd64"],
+                version="om-version-from-release.json",
+                sign=True,
+            ),
         },
         binaries={
             "kubectl-mongodb": BinaryInfo(

scripts/release/pipeline_main.py

@@ -18,8 +18,8 @@
 from scripts.release.atomic_pipeline import (
     build_agent_default_case,
     build_database_image,
-    build_init_appdb,
-    build_init_database,
+    build_init_appdb_image,
+    build_init_database_image,
     build_init_om_image,
     build_mco_tests_image,
     build_om_image,
@@ -59,8 +59,8 @@ def get_builder_function_for_image_name() -> Dict[str, Callable]:
         "agent-pct": build_agent_on_agent_bump,
         "agent": build_agent_default_case,
         # Init images
-        "init-appdb": build_init_appdb,  # working
-        "init-database": build_init_database,  # working
+        "init-appdb": build_init_appdb_image,  # working
+        "init-database": build_init_database_image,  # working
         "init-ops-manager": build_init_om_image,  # working
         # Ops Manager image
         "ops-manager": build_om_image,