add release for agent support back to pipeline.py

Author: nammn

.evergreen-functions.yml

@@ -526,28 +526,6 @@ functions:
         working_dir: src/github.com/mongodb/mongodb-kubernetes
         binary: scripts/dev/run_python.sh scripts/release/pipeline_main.py --parallel ${image_name} ${all_agents}
 
-  release_pipeline:
-    - *switch_context
-    - command: shell.exec
-      type: setup
-      params:
-        shell: bash
-        script: |
-          # Docker Hub workaround
-          # docker buildx needs the moby/buildkit image when setting up a builder so we pull it from our mirror
-          docker buildx create --driver=docker-container --driver-opt=image=268558157000.dkr.ecr.eu-west-1.amazonaws.com/docker-hub-mirrors/moby/buildkit:buildx-stable-1 --use
-          docker buildx inspect --bootstrap
-    - command: subprocess.exec
-      retry_on_failure: true
-      type: setup
-      params:
-        shell: bash
-        <<: *e2e_include_expansions_in_env
-        working_dir: src/github.com/mongodb/mongodb-kubernetes
-        env:
-          git_tag: ${triggered_by_git_tag}
-        binary: scripts/dev/run_python.sh scripts/release/pipeline_main.py ${image_name} --build-scenario release ${git_tag|--version ${git_tag}}
-
   # TODO: CLOUDP-335471 ; once all image builds are made with the new atomic pipeline, remove the following function
   legacy_pipeline:
     - *switch_context

.evergreen.yml

@@ -356,7 +356,7 @@ tasks:
       - func: setup_building_host
       - func: quay_login
       - func: setup_docker_sbom
-      - func: release_pipeline
+      - func: legacy_pipeline
         vars:
           image_name: agent
 
@@ -1787,17 +1787,17 @@ buildvariants:
     tags: [ "release_agent" ]
     run_on:
       - release-ubuntu2204-large # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
-    depends_on:
-      - variant: init_test_run
-        name: build_agent_images_ubi # this ensures the agent gets released to ECR as well
-      - variant: e2e_multi_cluster_kind
-        name: '*'
-      - variant: e2e_static_multi_cluster_2_clusters
-        name: '*'
-      - variant: e2e_mdb_kind_ubi_cloudqa
-        name: '*'
-      - variant: e2e_static_mdb_kind_ubi_cloudqa
-        name: '*'
+#    depends_on:
+##      - variant: init_test_run
+##        name: build_agent_images_ubi # this ensures the agent gets released to ECR as well
+##      - variant: e2e_multi_cluster_kind
+##        name: '*'
+##      - variant: e2e_static_multi_cluster_2_clusters
+##        name: '*'
+##      - variant: e2e_mdb_kind_ubi_cloudqa
+##        name: '*'
+##      - variant: e2e_static_mdb_kind_ubi_cloudqa
+##        name: '*'
     tasks:
       - name: release_agent
 

inventories/agent.yaml

@@ -3,7 +3,7 @@ vars:
   s3_bucket: s3://enterprise-operator-dockerfiles/dockerfiles/mongodb-agent
 
 images:
-  - name: mongodb-agent-ubi
+  - name: mongodb-agent
     vars:
       context: .
       template_context: docker/mongodb-agent

lib/sonar/template.py

@@ -13,7 +13,7 @@ def render(path: str, template_name: str, parameters: Dict[str, str]) -> str:
     """
     env = jinja2.Environment(loader=jinja2.FileSystemLoader(path), undefined=jinja2.StrictUndefined)
 
-    template = "Dockerfile"
+    template = "Dockerfile.old"
     if template_name is not None:
         template = "Dockerfile.{}".format(template_name)
 

pipeline.py

@@ -1203,7 +1203,6 @@ def build_multi_arch_agent_in_sonar(
     """
 
     logger.info(f"building multi-arch base image for: {image_version}")
-    is_release = build_configuration.is_release_step_executed()
     args = {
         "version": image_version,
         "tools_version": tools_version,
@@ -1233,7 +1232,7 @@ def build_multi_arch_agent_in_sonar(
 
     build_image_generic(
         config=build_configuration,
-        image_name="mongodb-agent-ubi",
+        image_name="mongodb-agent",
         inventory_file="inventories/agent.yaml",
         multi_arch_args_list=joined_args,
         with_image_base=False,
@@ -1315,18 +1314,14 @@ def _build_agents(
     tasks_queue: Queue,
 ):
     agent_version = agent_tools_version[0]
-    agent_distro = "rhel9_x86_64"
     tools_version = agent_tools_version[1]
-    tools_distro = get_tools_distro(tools_version)["amd"]
 
     tasks_queue.put(
         executor.submit(
             build_multi_arch_agent_in_sonar,
             build_configuration,
             agent_version,
-            agent_distro,
             tools_version,
-            tools_distro,
         )
     )