fix merge

Author: nammn

.evergreen-functions.yml

@@ -539,27 +539,18 @@ functions:
           - version_id
         add_to_path:
           - ${workdir}/bin
-        binary: scripts/evergreen/e2e/build_e2e_image_ibm.sh
+        binary: scripts/evergreen/e2e/build_tests_image_ibm.sh
 
   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
-        binary: scripts/dev/run_python.sh scripts/release/pipeline_main.py --parallel ${image_name} ${all_agents}
+        binary: scripts/dev/run_python.sh scripts/release/pipeline_main.py --parallel ${image_name} ${all_agents} ${build_scenario}
 
   # TODO: CLOUDP-335471 ; once all image builds are made with the new atomic pipeline, remove the following function
   legacy_pipeline:

.evergreen.yml

@@ -351,9 +351,10 @@ tasks:
       - func: setup_building_host
       - func: quay_login
       - func: setup_docker_sbom
-      - func: legacy_pipeline
+      - func: pipeline
         vars:
           image_name: agent
+          build_scenario: --build-scenario manual_release
 
   - name: run_precommit_and_push
     tags: ["patch-run"]
@@ -565,10 +566,10 @@ tasks:
       - func: setup_building_host
       - func: quay_login
       - func: setup_docker_sbom
-      - func: legacy_pipeline
+      - func: pipeline
         vars:
           image_name: ops-manager
-          include_tags: release
+          build_scenario: --build-scenario manual_release
 
   - name: prepare_and_upload_openshift_bundles_for_e2e
     commands:
@@ -1288,7 +1289,7 @@ buildvariants:
     display_name: e2e_mdb_kind_ubi_cloudqa
     tags: [ "e2e_test_suite", "cloudqa" ]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-medium
     <<: *base_no_om_image_dependency
     tasks:
       - name: e2e_mdb_kind_cloudqa_task_group
@@ -1306,7 +1307,7 @@ buildvariants:
     display_name: e2e_static_mdb_kind_ubi_cloudqa
     tags: [ "e2e_test_suite", "cloudqa" ]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-medium
     <<: *base_no_om_image_dependency
     tasks:
       - name: e2e_mdb_kind_cloudqa_task_group
@@ -1408,7 +1409,7 @@ buildvariants:
     display_name: e2e_static_om70_kind_ubi
     tags: [ "e2e_test_suite" ]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-medium
     <<: *base_om7_dependency
     tasks:
       - name: e2e_static_ops_manager_kind_only_task_group
@@ -1431,7 +1432,7 @@ buildvariants:
     display_name: e2e_static_om80_kind_ubi
     tags: [ "e2e_test_suite" ]
     run_on:
-      - ubuntu2204-large
+      - ubuntu2204-medium
     <<: *base_om8_dependency
     tasks:
       - name: e2e_static_ops_manager_kind_only_task_group
@@ -1465,7 +1466,7 @@ buildvariants:
     run_on:
       - rhel9-power-small
       - rhel9-power-large
-    allowed_requesters: [ "github_tag" ]
+    allowed_requesters: [ "patch", "github_tag" ]
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run
@@ -1488,7 +1489,7 @@ buildvariants:
     run_on:
       - rhel9-zseries-small
       - rhel9-zseries-large
-    allowed_requesters: [ "github_tag" ]
+    allowed_requesters: [ "patch", "github_tag" ]
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run