Smoke tests fix

Author: MaciejKaras

.evergreen.yml

@@ -1368,25 +1368,13 @@ buildvariants:
     tasks:
       - name: e2e_operator_race_with_telemetry_task_group
 
-  - name: e2e_smoke
-    display_name: e2e_smoke
-    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite" ]
-    run_on:
-      - ubuntu2204-large
-    allowed_requesters: [ "patch", "github_tag" ]
-    depends_on:
-      - name: build_test_image
-        variant: init_test_run
-    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" ]
+    tags: [ "e2e_test_suite" ]
     run_on:
       - rhel9-power-small
       - rhel9-power-large
-    allowed_requesters: [ "patch", "github_tag" , "commit"]
+    allowed_requesters: [ "patch", "commit"]
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run
@@ -1403,13 +1391,13 @@ buildvariants:
     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" ]
+  - name: e2e_static_smoke_ibm_power
+    display_name: e2e_static_smoke_ibm_power
+    tags: [ "e2e_test_suite", "static" ]
     run_on:
-      - rhel9-zseries-small
-      - rhel9-zseries-large
-    allowed_requesters: [ "patch", "github_tag", "commit"]
+      - rhel9-power-small
+      - rhel9-power-large
+    allowed_requesters: [ "patch", "commit"]
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run
@@ -1422,37 +1410,17 @@ buildvariants:
       - name: build_init_om_images_ubi
         variant: init_test_run
       - name: build_test_image_ibm
-        variant: init_test_run_ibm_z
+        variant: init_test_run_ibm_power
     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", "commit"]
-    <<: *base_no_om_image_dependency
-    tasks:
-      - name: e2e_smoke_arm_task_group
-
-  - name: e2e_static_smoke_arm
-    display_name: e2e_smoke_arm
-    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
-    run_on:
-      - ubuntu2204-arm64-large
-    allowed_requesters: [ "patch", "github_tag", "commit"]
-    <<: *base_no_om_image_dependency
-    tasks:
-      - name: e2e_smoke_arm_task_group
-
-  - name: e2e_static_smoke_ibm_z
-    display_name: e2e_static_smoke_ibm_z
-    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
+  - name: e2e_smoke_ibm_z
+    display_name: e2e_smoke_ibm_z
+    tags: [ "e2e_test_suite" ]
     run_on:
       - rhel9-zseries-small
       - rhel9-zseries-large
-    allowed_requesters: [ "patch", "github_tag", "commit"]
+    allowed_requesters: [ "patch", "commit"]
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run
@@ -1469,13 +1437,13 @@ buildvariants:
     tasks:
       - name: e2e_smoke_ibm_task_group
 
-  - name: e2e_static_smoke_ibm_power
-    display_name: e2e_static_smoke_ibm_power
-    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
+  - name: e2e_static_smoke_ibm_z
+    display_name: e2e_static_smoke_ibm_z
+    tags: [ "e2e_test_suite", "static" ]
     run_on:
-      - rhel9-power-small
-      - rhel9-power-large
-    allowed_requesters: [ "patch", "github_tag", "commit"]
+      - rhel9-zseries-small
+      - rhel9-zseries-large
+    allowed_requesters: [ "patch", "commit"]
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run
@@ -1488,21 +1456,29 @@ buildvariants:
       - name: build_init_om_images_ubi
         variant: init_test_run
       - name: build_test_image_ibm
-        variant: init_test_run_ibm_power
+        variant: init_test_run_ibm_z
     tasks:
       - name: e2e_smoke_ibm_task_group
 
-  - name: e2e_static_smoke
-    display_name: e2e_static_smoke
-    tags: [ "e2e_test_suite", "e2e_smoke_release_test_suite", "static" ]
+  - name: e2e_smoke_arm
+    display_name: e2e_smoke_arm
+    tags: [ "e2e_test_suite" ]
     run_on:
-      - ubuntu2204-large
-    allowed_requesters: [ "patch", "github_tag" ]
-    depends_on:
-      - name: build_test_image
-        variant: init_test_run
+      - ubuntu2204-arm64-large
+    allowed_requesters: [ "patch", "commit"]
+    <<: *base_no_om_image_dependency
     tasks:
-      - name: e2e_smoke_task_group
+      - name: e2e_smoke_arm_task_group
+
+  - name: e2e_static_smoke_arm
+    display_name: e2e_smoke_arm
+    tags: [ "e2e_test_suite", "static" ]
+    run_on:
+      - ubuntu2204-arm64-large
+    allowed_requesters: [ "patch", "commit"]
+    <<: *base_no_om_image_dependency
+    tasks:
+      - name: e2e_smoke_arm_task_group
 
   - name: e2e_multi_cluster_kind
     display_name: e2e_multi_cluster_kind