Multi arch pipeline combined

.evergreen-functions.yml

@@ -51,10 +51,22 @@ functions:
 
   ### Setup Functions ###
 
+  setup_jq: &setup_jq
+    command: subprocess.exec
+    type: setup
+    params:
+      <<: *e2e_include_expansions_in_env
+      add_to_path:
+        - ${workdir}/bin
+      working_dir: src/github.com/mongodb/mongodb-kubernetes
+      binary: scripts/evergreen/setup_jq.sh
+
   setup_context: &setup_context # Running the first switch is important to fill the workdir and other important initial env vars
     command: shell.exec
     type: setup
     params:
+      add_to_path:
+        - ${workdir}/bin
       shell: bash
       working_dir: src/github.com/mongodb/mongodb-kubernetes
       <<: *e2e_include_expansions_in_env
@@ -103,6 +115,7 @@ functions:
       type: setup
       params:
         command: "git config --global user.email '[email protected]'"
+    - *setup_jq # we need jq in the context
     - *setup_context
 
   setup_kubectl: &setup_kubectl
@@ -112,13 +125,6 @@ functions:
       working_dir: src/github.com/mongodb/mongodb-kubernetes
       binary: scripts/evergreen/setup_kubectl.sh
 
-  setup_jq: &setup_jq
-    command: subprocess.exec
-    type: setup
-    params:
-      working_dir: src/github.com/mongodb/mongodb-kubernetes
-      binary: scripts/evergreen/setup_jq.sh
-
   setup_shellcheck:
     command: subprocess.exec
     type: setup
@@ -225,7 +231,7 @@ functions:
       working_dir: src/github.com/mongodb/mongodb-kubernetes
       add_to_path:
         - ${workdir}/bin
-      binary: scripts/dev/configure_docker_auth.sh
+      binary: scripts/dev/configure_container_auth.sh
 
   setup_evg_host: &setup_evg_host
     command: subprocess.exec
@@ -261,11 +267,30 @@ functions:
     - *setup_evg_host
     - *python_venv
 
-  prune_docker_resources:
+  # This differs for normal evg_host as we require minikube instead of kind for
+  # IBM machines and install aws cli via pip instead
+  setup_building_host_minikube:
+    - *switch_context
     - command: subprocess.exec
       type: setup
       params:
-        command: "docker system prune -a -f"
+        working_dir: src/github.com/mongodb/mongodb-kubernetes
+        add_to_path:
+          - ${workdir}/bin
+        command: scripts/evergreen/setup_minikube_host.sh
+
+  prune_docker_resources:
+    - command: shell.exec
+      type: setup
+      params:
+        shell: bash
+        script: |
+          if command -v docker >/dev/null 2>&1; then
+            echo "Docker found, pruning docker resources..."
+            docker system prune -a -f
+          else
+            echo "Docker not found, skipping docker resource pruning"
+          fi
 
   # the task configures the set of tools necessary for any task working with K8 cluster:
   # installs kubectl, jq, kind (if necessary), configures docker authentication
@@ -327,8 +352,7 @@ functions:
         shell: bash
         working_dir: src/github.com/mongodb/mongodb-kubernetes
         script: |
-          source .generated/context.export.env
-          scripts/evergreen/e2e/setup_cloud_qa.py create
+          scripts/evergreen/run_python.sh scripts/evergreen/e2e/setup_cloud_qa.py create
     # The additional switch is needed, since we now have created the needed OM exports.
     - *switch_context
 
@@ -339,8 +363,7 @@ functions:
         shell: bash
         working_dir: src/github.com/mongodb/mongodb-kubernetes
         script: |
-          source .generated/context.export.env
-          scripts/evergreen/e2e/setup_cloud_qa.py delete
+          scripts/evergreen/run_python.sh scripts/evergreen/e2e/setup_cloud_qa.py delete
 
   dump_diagnostic_information_from_all_namespaces:
     - command: subprocess.exec
@@ -504,6 +527,18 @@ functions:
           - ${workdir}/bin
           - ${workdir}
 
+  build_test_image_ibm:
+    - *switch_context
+    - command: subprocess.exec
+      params:
+        shell: bash
+        working_dir: src/github.com/mongodb/mongodb-kubernetes
+        include_expansions_in_env:
+          - version_id
+        add_to_path:
+          - ${workdir}/bin
+        binary: scripts/evergreen/e2e/build_e2e_image_ibm.sh
+
   pipeline:
     - *switch_context
     - command: shell.exec

.evergreen.yml

@@ -77,6 +77,13 @@ variables:
       - func: download_kube_tools
       - func: setup_building_host
 
+  - &setup_group_ibm
+    setup_group_can_fail_task: true
+    setup_group:
+      - func: clone
+      - func: setup_building_host_minikube
+      - func: build_multi_cluster_binary
+
   - &setup_group_multi_cluster
     setup_group_can_fail_task: true
     setup_group:
@@ -423,15 +430,23 @@ tasks:
       - func: build_multi_cluster_binary
       - func: pipeline
         vars:
-          image_name: test
+          image_name: meko-tests
+
+
+  - name: build_test_image_ibm
+    commands:
+      - func: clone
+      - func: setup_building_host
+      - func: build_multi_cluster_binary
+      - func: build_test_image_ibm
 
   - name: build_mco_test_image
     commands:
       - func: clone
       - func: setup_building_host
       - func: pipeline
         vars:
-          image_name: mco-test
+          image_name: mco-tests
 
   - name: build_operator_ubi
     commands:
@@ -1185,6 +1200,22 @@ task_groups:
       - e2e_om_ops_manager_backup
     <<: *teardown_group
 
+  - name: e2e_smoke_arm_task_group
+    max_hosts: -1
+    <<: *setup_group
+    <<: *setup_and_teardown_task_cloudqa
+    tasks:
+      - e2e_replica_set
+    <<: *teardown_group
+
+  - name: e2e_smoke_ibm_task_group
+    max_hosts: -1
+    <<: *setup_group_ibm
+    <<: *setup_and_teardown_task_cloudqa
+    tasks:
+      - e2e_replica_set
+    <<: *teardown_group
+
   - name: e2e_ops_manager_kind_5_0_only_task_group
     max_hosts: -1
     <<: *setup_group
@@ -1450,6 +1481,64 @@ buildvariants:
     tasks:
       - name: e2e_smoke_task_group
 
+  - name: e2e_smoke_ibm_power
+    display_name: e2e_smoke_ibm_power
+    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
+    run_on:
+      - rhel9-power-large
+    allowed_requesters: [ "patch", "github_tag" ]
+    depends_on:
+      - name: build_operator_ubi
+        variant: init_test_run
+      - name: build_init_database_image_ubi
+        variant: init_test_run
+      - name: build_database_image_ubi
+        variant: init_test_run
+      - name: build_init_appdb_images_ubi
+        variant: init_test_run
+      - name: build_init_om_images_ubi
+        variant: init_test_run
+      - name: build_agent_images_ubi
+        variant: init_test_run
+      - name: build_test_image_ibm
+        variant: init_test_run_ibm
+    tasks:
+      - name: e2e_smoke_ibm_task_group
+
+  - name: e2e_smoke_ibm_z
+    display_name: e2e_smoke_ibm_z
+    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
+    run_on:
+      - rhel9-zseries-small
+    allowed_requesters: [ "patch", "github_tag" ]
+    depends_on:
+      - name: build_operator_ubi
+        variant: init_test_run
+      - name: build_init_database_image_ubi
+        variant: init_test_run
+      - name: build_database_image_ubi
+        variant: init_test_run
+      - name: build_init_appdb_images_ubi
+        variant: init_test_run
+      - name: build_init_om_images_ubi
+        variant: init_test_run
+      - name: build_agent_images_ubi
+        variant: init_test_run
+      - name: build_test_image_ibm
+        variant: init_test_run_ibm
+    tasks:
+      - name: e2e_smoke_ibm_task_group
+
+  - name: e2e_smoke_arm
+    display_name: e2e_smoke_arm
+    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
+    run_on:
+      - ubuntu2204-arm64-large
+    allowed_requesters: [ "patch", "github_tag" ]
+    <<: *base_no_om_image_dependency
+    tasks:
+      - name: e2e_smoke_arm_task_group
+
   - name: e2e_static_smoke
     display_name: e2e_static_smoke
     tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
@@ -1664,6 +1753,14 @@ buildvariants:
       - name: build_upgrade_hook_image
       - name: prepare_aws
 
+  - name: init_test_run_ibm
+    display_name: init_test_run_ibm
+    max_hosts: -1
+    run_on:
+      - ubuntu2204-small
+    tasks:
+      - name: build_test_image_ibm
+
   - name: init_release_agents_on_ecr
     display_name: init_release_agents_on_ecr
     # this enables us to run this variant either manually (patch) which pct does or during an OM bump (github_pr)

Makefile

@@ -147,7 +147,7 @@ ac:
 # in parallel and both call 'aws_login') then Docker login may return an error "Error saving credentials:..The
 # specified item already exists in the keychain". Seems this allows to ignore the error
 aws_login:
-	@ scripts/dev/configure_docker_auth.sh
+	@ scripts/dev/configure_container_auth.sh
 
 # cleans up aws resources, including s3 buckets which are older than 5 hours
 aws_cleanup:

README.md

@@ -57,4 +57,3 @@ Migration from [MongoDB Community Operator](https://github.com/mongodb/mongodb-k
 See our detailed migration guides:
 - [Migrating from MongoDB Community Operator](docs/migration/community-operator-migration.md)
 - [Migrating from MongoDB Enterprise Kubernetes Operator](https://www.mongodb.com/docs/kubernetes/current/tutorial/migrate-to-mck/)
-