From 297aaf71b0434ccffecdf71266c6f6ef892a7c06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kara=C5=9B?= <maciej.karas@mongodb.com>
Date: Mon, 8 Sep 2025 21:04:56 +0200
Subject: [PATCH 1/5] Adding missing `prerelease_kind_code_snippets` used for
 release

---
 .evergreen-release.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.evergreen-release.yml b/.evergreen-release.yml
index f7f7b9ac0..c68b7fae6 100644
--- a/.evergreen-release.yml
+++ b/.evergreen-release.yml
@@ -151,9 +151,22 @@ buildvariants:
     tasks:
       - name: run_conditionally_prepare_and_upload_openshift_bundles
 
+  - name: prerelease_kind_code_snippets
+    display_name: prerelease_kind_code_snippets
+    tags: [ "prerelease_code_snippets", "release" ]
+    allowed_requesters: [ "patch", "github_tag" ]
+    depends_on:
+      - name: "*"
+        variant: release_images
+        patch_optional: true
+    run_on:
+      - ubuntu2404-large
+    tasks:
+      - name: kind_code_snippets_task_group
+
   - name: prerelease_gke_code_snippets
     display_name: prerelease_gke_code_snippets
-    tags: [ "release" ]
+    tags: [ "prerelease_code_snippets", "release" ]
     allowed_requesters: ["patch", "github_tag"]
     depends_on:
       - variant: release_images

From 241341a11ebba3e987d2bd6480dee61c8d57ecba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kara=C5=9B?= <maciej.karas@mongodb.com>
Date: Mon, 8 Sep 2025 21:18:57 +0200
Subject: [PATCH 2/5] Adding `pr_patch`, `staging` and `release` tags

---
 .evergreen-release.yml |  10 +--
 .evergreen.yml         | 151 ++++++++++++++++++++++-------------------
 2 files changed, 86 insertions(+), 75 deletions(-)

diff --git a/.evergreen-release.yml b/.evergreen-release.yml
index c68b7fae6..8306a7ec9 100644
--- a/.evergreen-release.yml
+++ b/.evergreen-release.yml
@@ -153,7 +153,7 @@ buildvariants:
 
   - name: prerelease_kind_code_snippets
     display_name: prerelease_kind_code_snippets
-    tags: [ "prerelease_code_snippets", "release" ]
+    tags: [ "release", "prerelease_code_snippets" ]
     allowed_requesters: [ "patch", "github_tag" ]
     depends_on:
       - name: "*"
@@ -166,7 +166,7 @@ buildvariants:
 
   - name: prerelease_gke_code_snippets
     display_name: prerelease_gke_code_snippets
-    tags: [ "prerelease_code_snippets", "release" ]
+    tags: [ "release", "prerelease_code_snippets" ]
     allowed_requesters: ["patch", "github_tag"]
     depends_on:
       - variant: release_images
@@ -179,7 +179,7 @@ buildvariants:
 
   - name: init_smoke_tests
     display_name: init_smoke_tests
-    tags: [ "e2e_smoke_release_test_suite" ]
+    tags: [ "release", "e2e_smoke_release_test_suite" ]
     allowed_requesters: [ "patch", "github_tag" ]
     run_on:
       - release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
@@ -188,7 +188,7 @@ buildvariants:
 
   - name: e2e_smoke
     display_name: e2e_smoke
-    tags: [ "e2e_smoke_release_test_suite" ]
+    tags: [ "release", "e2e_smoke_release_test_suite" ]
     run_on:
       - ubuntu2404-large
     allowed_requesters: [ "patch", "github_tag" ]
@@ -202,7 +202,7 @@ buildvariants:
 
   - name: e2e_static_smoke
     display_name: e2e_static_smoke
-    tags: [ "e2e_smoke_release_test_suite" ]
+    tags: [ "release", "e2e_smoke_release_test_suite" ]
     run_on:
       - ubuntu2404-large
     allowed_requesters: [ "patch", "github_tag" ]
diff --git a/.evergreen.yml b/.evergreen.yml
index d77ff676e..329ddb1c8 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -211,12 +211,22 @@ parameters:
     value: "false"
     description: set this to true if you would like the pipeline to automatically push a branch with updated snippets outputs
 
+# Each variant needs to be tagged with one or more tags referencing related build scenario:
+#  - pr_patch: for patches created by GitHub PRs
+#  - staging: for builds triggered when merging to master or release branch
+#  - release: for builds triggered on git tags
+# The only exception are manual tasks that are not related to any of the scenarios above. Examples: `migrate_all_agents`,
+# `e2e_operator_perf` or `publish_om80_images`.
+#
+# This configuration allows us to run all the associated tasks for each scenario from evergreen command line.
+# This is especially helpful when making changes to `staging` or `release` variants and testing them using Evergreen
+# command line patches. For example there is no other way to trigger tasks that are run on merges to master other than
+# combining them together using aliases. The same applies for tasks being run on git tags.
+#
+# See https://docs.devprod.prod.corp.mongodb.com/evergreen/Project-Configuration/Project-and-Distro-Settings#project-aliases
 
 # Triggered manually or by PCT.
 patch_aliases:
-  - alias: "periodic_builds"
-    variant_tags: [ "periodic_build" ]
-    task: ".*"
   - alias: "periodic_teardowns"
     variant_tags: [ "periodic_teardown" ]
     task: ".*"
@@ -226,27 +236,25 @@ patch_aliases:
   - alias: "release_all_agents_manually"
     variant_tags: [ "release_all_agents_manually" ]
     task: ".*"
-  - alias: "release"
-    variant_tags: [ "release", "e2e_smoke_release_test_suite" ]
-    task_tags: [ "image_release", "binary_release", "image_preflight", "openshift_bundles", "code_snippets", "patch-run" ]
   - alias: "smoke_test_release"
     variant_tags: [ "e2e_smoke_release_test_suite" ]
     task_tags: [ "patch-run" ]
   - alias: "patch-run-cloudqa"
     variant_tags: [ "cloudqa_non_static" ]
     task: ".*"
+  - alias: "release"
+    variant_tags: [ "release" ]
+    task: ".*"
+  - alias: "staging"
+    variant_tags: [ "staging" ]
+    task: ".*"
+  - alias: "pr_patch"
+    variant_tags: [ "pr_patch" ]
+    task: ".*"
 
 # Triggered whenever the GitHub PR is created
 github_pr_aliases:
-  - variant_tags: [ "unit_tests" ]
-    task_tags: [ "unit_tests" ]
-  - variant_tags: [ "e2e_test_suite" ]
-    task_tags: [ "patch-run" ]
-  - variant_tags: [ "e2e_mco_test_suite" ]
-    task: ".*"
-  - variant_tags: [ "auto_bump" ]
-    task_tags: [ "patch-run" ]
-  - variant_tags: [ "release_agents_on_ecr" ]
+  - variant_tags: [ "pr_patch" ]
     task: ".*"
 
 # Allows to see evergreen checks in GitHub commits
@@ -258,8 +266,8 @@ github_checks_aliases:
 # Triggered on git tag
 git_tag_aliases:
   - git_tag: "^(\\d+\\.)?(\\d+\\.)?(\\d+)$"
-    variant_tags: [ "release", "e2e_smoke_release_test_suite" ]
-    task_tags: [ "image_release", "image_preflight", "binary_release", "openshift_bundles", "code_snippets", "patch-run" ]
+    variant_tags: [ "release" ]
+    task: ".*"
 
 tasks:
   - name: unit_tests_golang
@@ -1181,7 +1189,7 @@ buildvariants:
 
   - name: unit_tests
     display_name: "unit_tests"
-    tags: [ "unit_tests" ]
+    tags: [ "pr_patch", "staging", "unit_tests" ]
     run_on:
       - ubuntu2204-small #TODO: Uses older ubuntu2204, because for some reason on ubuntu2404 the helm binary is not found
     tasks:
@@ -1199,7 +1207,7 @@ buildvariants:
   # MongoDBCommunity build variant
   - name: e2e_mdb_community
     display_name: e2e_mdb_community
-    tags: [ "e2e_test_suite" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite" ]
     run_on:
       - ubuntu2404-large
     <<: *community_dependency
@@ -1209,7 +1217,7 @@ buildvariants:
   ## MongoDB build variants
   - name: e2e_mdb_kind_ubi_cloudqa
     display_name: e2e_mdb_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
     run_on:
       - ubuntu2404-medium
     <<: *base_no_om_image_dependency
@@ -1218,7 +1226,7 @@ buildvariants:
 
   - name: e2e_custom_domain_mdb_kind_ubi_cloudqa
     display_name: e2e_custom_domain_mdb_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
     run_on:
       - ubuntu2404-large
     <<: *base_no_om_image_dependency
@@ -1227,7 +1235,7 @@ buildvariants:
 
   - name: e2e_static_mdb_kind_ubi_cloudqa
     display_name: e2e_static_mdb_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa", "static" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "static" ]
     run_on:
       - ubuntu2404-medium
     <<: *base_no_om_image_dependency
@@ -1236,7 +1244,7 @@ buildvariants:
 
   - name: e2e_static_custom_domain_mdb_kind_ubi_cloudqa
     display_name: e2e_static_custom_domain_mdb_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa", "static" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "static" ]
     run_on:
       - ubuntu2404-large
     depends_on:
@@ -1256,7 +1264,7 @@ buildvariants:
 
   - name: e2e_mdb_openshift_ubi_cloudqa
     display_name: e2e_mdb_openshift_ubi_cloudqa
-    tags: [ "e2e_openshift_test_suite", "cloudqa", "cloudqa_non_static" ]
+    tags: [ "pr_patch", "staging", "e2e_openshift_test_suite", "cloudqa", "cloudqa_non_static" ]
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run
@@ -1276,7 +1284,7 @@ buildvariants:
   # in evergreen for all variants matching e2e_static-*, but we do not want to run openshift variants on every pr.
   - name: e2e_openshift_static_mdb_ubi_cloudqa
     display_name: e2e_openshift_static_mdb_ubi_cloudqa
-    tags: [ "e2e_openshift_test_suite", "cloudqa", "static" ]
+    tags: [ "pr_patch", "staging", "e2e_openshift_test_suite", "cloudqa", "static" ]
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run
@@ -1295,7 +1303,7 @@ buildvariants:
   # Isolated Ops Manager Tests for 6.0 version
   - name: e2e_om60_kind_ubi
     display_name: e2e_om60_kind_ubi
-    tags: [ "e2e_test_suite" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite" ]
     run_on:
       - ubuntu2204-medium-high-memory
     <<: *base_om6_dependency
@@ -1307,7 +1315,7 @@ buildvariants:
   # Isolated Ops Manager Tests for 6.0 version
   - name: e2e_static_om60_kind_ubi
     display_name: e2e_static_om60_kind_ubi
-    tags: [ "e2e_test_suite", "static" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "static" ]
     run_on:
       - ubuntu2404-medium
     <<: *base_om6_dependency
@@ -1317,7 +1325,7 @@ buildvariants:
 
   - name: e2e_om70_kind_ubi
     display_name: e2e_om70_kind_ubi
-    tags: [ "e2e_test_suite" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "patch" ]
     run_on:
       - ubuntu2204-medium-high-memory
     <<: *base_om7_dependency
@@ -1329,7 +1337,7 @@ buildvariants:
 
   - name: e2e_static_om70_kind_ubi
     display_name: e2e_static_om70_kind_ubi
-    tags: [ "e2e_test_suite", "static" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "static" ]
     run_on:
       - ubuntu2404-medium
     <<: *base_om7_dependency
@@ -1340,7 +1348,7 @@ buildvariants:
 
   - name: e2e_om80_kind_ubi
     display_name: e2e_om80_kind_ubi
-    tags: [ "e2e_test_suite" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite" ]
     run_on:
       - ubuntu2204-medium-high-memory
     <<: *base_om8_dependency
@@ -1352,7 +1360,7 @@ buildvariants:
 
   - name: e2e_static_om80_kind_ubi
     display_name: e2e_static_om80_kind_ubi
-    tags: [ "e2e_test_suite", "static" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "static" ]
     run_on:
       - ubuntu2404-medium
     <<: *base_om8_dependency
@@ -1363,7 +1371,7 @@ buildvariants:
 
   - name: e2e_operator_race_ubi_with_telemetry
     display_name: e2e_operator_race_ubi_with_telemetry
-    tags: [ "e2e_test_suite" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite" ]
     run_on:
       - ubuntu1804-xlarge
     <<: *base_om7_dependency_with_race
@@ -1372,7 +1380,7 @@ buildvariants:
 
   - name: e2e_smoke_ibm_power
     display_name: e2e_smoke_ibm_power
-    tags: [ "e2e_test_suite" ]
+    tags: [ "staging", "e2e_smoke_test_suite" ]
     run_on:
       - rhel9-power-small
       - rhel9-power-large
@@ -1395,7 +1403,7 @@ buildvariants:
 
   - name: e2e_static_smoke_ibm_power
     display_name: e2e_static_smoke_ibm_power
-    tags: [ "e2e_test_suite", "static" ]
+    tags: [ "staging", "e2e_smoke_test_suite", "static" ]
     run_on:
       - rhel9-power-small
       - rhel9-power-large
@@ -1418,7 +1426,7 @@ buildvariants:
 
   - name: e2e_smoke_ibm_z
     display_name: e2e_smoke_ibm_z
-    tags: [ "e2e_test_suite" ]
+    tags: [ "staging", "e2e_smoke_test_suite" ]
     run_on:
       - rhel9-zseries-small
       - rhel9-zseries-large
@@ -1441,7 +1449,7 @@ buildvariants:
 
   - name: e2e_static_smoke_ibm_z
     display_name: e2e_static_smoke_ibm_z
-    tags: [ "e2e_test_suite", "static" ]
+    tags: [ "staging", "e2e_smoke_test_suite", "static" ]
     run_on:
       - rhel9-zseries-small
       - rhel9-zseries-large
@@ -1464,7 +1472,7 @@ buildvariants:
 
   - name: e2e_smoke_arm
     display_name: e2e_smoke_arm
-    tags: [ "e2e_test_suite" ]
+    tags: [ "staging", "e2e_smoke_test_suite" ]
     run_on:
       - ubuntu2404-arm64-large
     allowed_requesters: [ "patch", "commit" ]
@@ -1474,7 +1482,7 @@ buildvariants:
 
   - name: e2e_static_smoke_arm
     display_name: e2e_smoke_arm
-    tags: [ "e2e_test_suite", "static" ]
+    tags: [ "staging", "e2e_smoke_test_suite", "static" ]
     run_on:
       - ubuntu2404-arm64-large
     allowed_requesters: [ "patch", "commit" ]
@@ -1484,7 +1492,7 @@ buildvariants:
 
   - name: e2e_multi_cluster_kind
     display_name: e2e_multi_cluster_kind
-    tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
     run_on:
       - ubuntu2404-large
     <<: *base_om6_dependency
@@ -1493,7 +1501,7 @@ buildvariants:
 
   - name: e2e_static_multi_cluster_kind
     display_name: e2e_static_multi_cluster_kind
-    tags: [ "e2e_test_suite", "cloudqa", "static" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "static" ]
     run_on:
       - ubuntu2404-large
     <<: *base_om6_dependency
@@ -1502,7 +1510,7 @@ buildvariants:
 
   - name: e2e_multi_cluster_2_clusters
     display_name: e2e_multi_cluster_2_clusters
-    tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
     run_on:
       - ubuntu2404-large
     <<: *base_om6_dependency
@@ -1511,7 +1519,7 @@ buildvariants:
 
   - name: e2e_static_multi_cluster_2_clusters
     display_name: e2e_static_multi_cluster_2_clusters
-    tags: [ "e2e_test_suite", "cloudqa", "static" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "static" ]
     run_on:
       - ubuntu2404-large
     <<: *base_om6_dependency
@@ -1520,7 +1528,7 @@ buildvariants:
 
   - name: e2e_multi_cluster_om_appdb
     display_name: e2e_multi_cluster_om_appdb
-    tags: [ "e2e_test_suite" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite" ]
     run_on:
       - ubuntu2404-large
     <<: *base_om6_dependency
@@ -1529,7 +1537,7 @@ buildvariants:
 
   - name: e2e_static_multi_cluster_om_appdb
     display_name: e2e_static_multi_cluster_om_appdb
-    tags: [ "e2e_test_suite", "static" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "static" ]
     run_on:
       - ubuntu2404-large
     <<: *base_om6_dependency
@@ -1538,7 +1546,7 @@ buildvariants:
 
   - name: e2e_multi_cluster_om_operator_not_in_mesh
     display_name: e2e_multi_cluster_om_operator_not_in_mesh
-    tags: [ "e2e_test_suite" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite" ]
     run_on:
       - ubuntu2404-large
     <<: *base_om7_dependency
@@ -1549,7 +1557,7 @@ buildvariants:
 
   - name: e2e_operator_kind_ubi_cloudqa
     display_name: e2e_operator_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
     run_on:
       - ubuntu2404-large
     <<: *base_no_om_image_dependency
@@ -1558,7 +1566,7 @@ buildvariants:
 
   - name: e2e_static_operator_kind_ubi_cloudqa
     display_name: e2e_static_operator_kind_ubi_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa", "static" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "static" ]
     run_on:
       - ubuntu2404-large
     <<: *base_no_om_image_dependency
@@ -1567,7 +1575,7 @@ buildvariants:
 
   - name: e2e_operator_no_webhook_roles_cloudqa
     display_name: e2e_operator_no_webhook_roles_cloudqa
-    tags: [ "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "cloudqa", "cloudqa_non_static" ]
     run_on:
       - ubuntu2404-large
     <<: *base_no_om_image_dependency
@@ -1576,7 +1584,7 @@ buildvariants:
 
   - name: e2e_kind_olm_ubi
     display_name: e2e_kind_olm_ubi
-    tags: [ "e2e_test_suite" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite" ]
     run_on:
       - ubuntu2404-large
     depends_on:
@@ -1601,7 +1609,7 @@ buildvariants:
 
   - name: e2e_static_kind_olm_ubi
     display_name: e2e_static_kind_olm_ubi
-    tags: [ "e2e_test_suite", "static" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite", "static" ]
     run_on:
       - ubuntu2404-large
     depends_on:
@@ -1625,7 +1633,7 @@ buildvariants:
     # This variants runs the tests from MCO with the MEKO operator binary
   - name: e2e_mco_tests
     display_name: "e2e_mco_tests"
-    tags: [ "e2e_mco_test_suite" ]
+    tags: [ "pr_patch", "staging", "e2e_mco_test_suite" ]
     <<: *community_dependency
     run_on:
       - ubuntu2004-large
@@ -1667,6 +1675,7 @@ buildvariants:
   - name: init_test_run
     display_name: init_test_run
     max_hosts: -1
+    tags: [ "pr_patch", "staging" ]
     run_on:
       - ubuntu2404-small
     tasks:
@@ -1686,6 +1695,7 @@ buildvariants:
   - name: init_test_run_ibm_power
     display_name: init_test_run_ibm_power
     max_hosts: -1
+    tags: [ "pr_patch", "staging" ]
     run_on:
       - rhel9-power-small
       - rhel9-power-large
@@ -1695,6 +1705,7 @@ buildvariants:
   - name: init_test_run_ibm_z
     display_name: init_test_run_ibm_z
     max_hosts: -1
+    tags: [ "pr_patch", "staging" ]
     run_on:
       - rhel9-zseries-small
       - rhel9-zseries-large
@@ -1705,7 +1716,7 @@ buildvariants:
     priority: 70
     display_name: run_pre_commit
     allowed_requesters: [ "patch", "github_pr" ]
-    tags: [ "auto_bump" ]
+    tags: [ "pr_patch", "staging", "auto_bump" ]
     run_on:
       - ubuntu2404-small
     tasks:
@@ -1728,7 +1739,7 @@ buildvariants:
         variant: init_test_run
       - name: build_init_om_images_ubi
         variant: init_test_run
-
+    tags: [ "pr_patch", "staging" ]
     run_on:
       - ubuntu2404-small
     tasks:
@@ -1740,6 +1751,7 @@ buildvariants:
 
   - name: preflight_release_images_check_only
     display_name: preflight_release_images_check_only
+    tags: [ "pr_patch", "staging" ]
     run_on:
       - rhel90-large
     tasks:
@@ -1747,6 +1759,7 @@ buildvariants:
 
   - name: build_om60_images
     display_name: build_om60_images
+    tags: [ "pr_patch", "staging" ]
     run_on:
       - ubuntu2404-small
     tasks:
@@ -1754,6 +1767,7 @@ buildvariants:
 
   - name: preflight_om60_images
     display_name: preflight_om60_images
+    tags: [ "pr_patch", "staging" ]
     run_on:
       - rhel90-large
     tasks:
@@ -1761,6 +1775,7 @@ buildvariants:
 
   - name: build_om70_images
     display_name: build_om70_images
+    tags: [ "pr_patch", "staging" ]
     run_on:
       - ubuntu2404-small
     tasks:
@@ -1768,6 +1783,7 @@ buildvariants:
 
   - name: preflight_om70_images
     display_name: preflight_om70_images
+    tags: [ "pr_patch", "staging" ]
     run_on:
       - rhel90-large
     tasks:
@@ -1775,6 +1791,7 @@ buildvariants:
 
   - name: build_om80_images
     display_name: build_om80_images
+    tags: [ "pr_patch", "staging" ]
     run_on:
       - ubuntu2404-small
     tasks:
@@ -1782,6 +1799,7 @@ buildvariants:
 
   - name: preflight_om80_images
     display_name: preflight_om80_images
+    tags: [ "pr_patch", "staging" ]
     run_on:
       - rhel90-large
     tasks:
@@ -1838,8 +1856,17 @@ buildvariants:
     tasks:
       - name: gke_code_snippets_task_group
 
+  - name: public_kind_code_snippets
+    display_name: public_kind_code_snippets
+    allowed_requesters: [ "patch" ]
+    run_on:
+      - ubuntu2404-large
+    tasks:
+      - name: kind_code_snippets_task_group
+
   - name: private_gke_code_snippets
     display_name: private_gke_code_snippets
+    tags: [ "pr_patch", "staging", "e2e_test_suite" ]
     allowed_requesters: [ "patch" ]
     run_on:
       - ubuntu2404-small
@@ -1849,7 +1876,7 @@ buildvariants:
 
   - name: private_kind_code_snippets
     display_name: private_kind_code_snippets
-    tags: [ "e2e_test_suite" ]
+    tags: [ "pr_patch", "staging", "e2e_test_suite" ]
     allowed_requesters: [ "patch", "github_pr" ]
     run_on:
       - ubuntu2404-large
@@ -1857,22 +1884,6 @@ buildvariants:
     tasks:
       - name: kind_code_snippets_task_group
 
-  - name: prerelease_kind_code_snippets
-    display_name: prerelease_kind_code_snippets
-    allowed_requesters: [ "patch" ]
-    run_on:
-      - ubuntu2404-large
-    tasks:
-      - name: kind_code_snippets_task_group
-
-  - name: public_kind_code_snippets
-    display_name: public_kind_code_snippets
-    allowed_requesters: [ "patch" ]
-    run_on:
-      - ubuntu2404-large
-    tasks:
-      - name: kind_code_snippets_task_group
-
   ### Build variants for manual patch only
 
   - name: backup_csv_images

From d79acf5225ef3d27764daa54759f4ba1c8dcf726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kara=C5=9B?= <maciej.karas@mongodb.com>
Date: Mon, 8 Sep 2025 22:20:00 +0200
Subject: [PATCH 3/5] Fixes after internal review

---
 .evergreen-tasks.yml |  4 +---
 .evergreen.yml       | 52 ++++++++++++++++++++++++--------------------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/.evergreen-tasks.yml b/.evergreen-tasks.yml
index 9b6cfd893..9e80da272 100644
--- a/.evergreen-tasks.yml
+++ b/.evergreen-tasks.yml
@@ -74,14 +74,13 @@ tasks:
 # Each task is selected by convention by running scripts/code_snippets/${task_name}_test.sh
   - name: task_gke_multi_cluster_snippets
     tags: [ "code_snippets" ]
-    allowed_requesters: [ "patch", "github_tag" ]
     commands:
       - func: test_code_snippets
       - func: sample_commit_output
+      - func: sample_commit_output
 
   - name: task_gke_multi_cluster_no_mesh_snippets
     tags: [ "code_snippets" ]
-    allowed_requesters: [ "patch", "github_tag" ]
     commands:
       - func: test_code_snippets
       - func: sample_commit_output
@@ -791,7 +790,6 @@ tasks:
 
   - name: e2e_om_ops_manager_backup
     tags: [ "patch-run" ]
-    allowed_requesters: [ "github_tag", "patch" ]
     commands:
       - func: "e2e_test"
 
diff --git a/.evergreen.yml b/.evergreen.yml
index 329ddb1c8..4987e3d78 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -215,8 +215,8 @@ parameters:
 #  - pr_patch: for patches created by GitHub PRs
 #  - staging: for builds triggered when merging to master or release branch
 #  - release: for builds triggered on git tags
-# The only exception are manual tasks that are not related to any of the scenarios above. Examples: `migrate_all_agents`,
-# `e2e_operator_perf` or `publish_om80_images`.
+# For variants that are **only** triggered manually (patch) or by PCT we should use "manual_patch" tag.
+# Examples: `migrate_all_agents`, `e2e_operator_perf` or `publish_om80_images`.
 #
 # This configuration allows us to run all the associated tasks for each scenario from evergreen command line.
 # This is especially helpful when making changes to `staging` or `release` variants and testing them using Evergreen
@@ -1262,9 +1262,10 @@ buildvariants:
     tasks:
       - name: e2e_custom_domain_task_group
 
+  # We do not want to run openshift variants on every PR.
   - name: e2e_mdb_openshift_ubi_cloudqa
     display_name: e2e_mdb_openshift_ubi_cloudqa
-    tags: [ "pr_patch", "staging", "e2e_openshift_test_suite", "cloudqa", "cloudqa_non_static" ]
+    tags: [ "staging", "e2e_openshift_test_suite", "cloudqa", "cloudqa_non_static" ]
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run
@@ -1279,12 +1280,10 @@ buildvariants:
     tasks:
       - name: e2e_mdb_openshift_ubi_cloudqa_task_group
 
-  # This name is on purpose reversed from e2e_static_openshift to e2e_openshift_static.
-  # That is because we run a regex
-  # in evergreen for all variants matching e2e_static-*, but we do not want to run openshift variants on every pr.
-  - name: e2e_openshift_static_mdb_ubi_cloudqa
-    display_name: e2e_openshift_static_mdb_ubi_cloudqa
-    tags: [ "pr_patch", "staging", "e2e_openshift_test_suite", "cloudqa", "static" ]
+  # We do not want to run openshift variants on every PR.
+  - name: e2e_static_openshift_mdb_ubi_cloudqa
+    display_name: e2e_static_openshift_mdb_ubi_cloudqa
+    tags: [ "staging", "e2e_openshift_test_suite", "cloudqa", "static" ]
     depends_on:
       - name: build_operator_ubi
         variant: init_test_run
@@ -1642,7 +1641,7 @@ buildvariants:
 
   - name: e2e_operator_perf
     display_name: e2e_operator_perf
-    tags: [ "e2e_perf_test_suite" ]
+    tags: [ "manual_patch", "e2e_perf_test_suite" ]
     allowed_requesters: [ "patch" ]
     run_on:
       - ubuntu1804-xlarge
@@ -1652,7 +1651,7 @@ buildvariants:
 
   - name: e2e_operator_perf_one_thread
     display_name: e2e_operator_perf_one_thread
-    tags: [ "e2e_perf_test_suite" ]
+    tags: [ "manual_patch", "e2e_perf_test_suite" ]
     allowed_requesters: [ "patch" ]
     run_on:
       - ubuntu1804-xlarge
@@ -1662,7 +1661,7 @@ buildvariants:
 
   - name: e2e_operator_perf_thirty
     display_name: e2e_operator_perf_thirty
-    tags: [ "e2e_perf_test_suite" ]
+    tags: [ "manual_patch", "e2e_perf_test_suite" ]
     allowed_requesters: [ "patch" ]
     run_on:
       - ubuntu1804-xlarge
@@ -1695,7 +1694,7 @@ buildvariants:
   - name: init_test_run_ibm_power
     display_name: init_test_run_ibm_power
     max_hosts: -1
-    tags: [ "pr_patch", "staging" ]
+    tags: [ "staging" ]
     run_on:
       - rhel9-power-small
       - rhel9-power-large
@@ -1705,7 +1704,7 @@ buildvariants:
   - name: init_test_run_ibm_z
     display_name: init_test_run_ibm_z
     max_hosts: -1
-    tags: [ "pr_patch", "staging" ]
+    tags: [ "staging" ]
     run_on:
       - rhel9-zseries-small
       - rhel9-zseries-large
@@ -1716,7 +1715,7 @@ buildvariants:
     priority: 70
     display_name: run_pre_commit
     allowed_requesters: [ "patch", "github_pr" ]
-    tags: [ "pr_patch", "staging", "auto_bump" ]
+    tags: [ "pr_patch", "auto_bump" ]
     run_on:
       - ubuntu2404-small
     tasks:
@@ -1751,7 +1750,7 @@ buildvariants:
 
   - name: preflight_release_images_check_only
     display_name: preflight_release_images_check_only
-    tags: [ "pr_patch", "staging" ]
+    tags: [ "staging" ]
     run_on:
       - rhel90-large
     tasks:
@@ -1767,7 +1766,7 @@ buildvariants:
 
   - name: preflight_om60_images
     display_name: preflight_om60_images
-    tags: [ "pr_patch", "staging" ]
+    tags: [ "staging" ]
     run_on:
       - rhel90-large
     tasks:
@@ -1783,7 +1782,7 @@ buildvariants:
 
   - name: preflight_om70_images
     display_name: preflight_om70_images
-    tags: [ "pr_patch", "staging" ]
+    tags: [ "staging" ]
     run_on:
       - rhel90-large
     tasks:
@@ -1799,7 +1798,7 @@ buildvariants:
 
   - name: preflight_om80_images
     display_name: preflight_om80_images
-    tags: [ "pr_patch", "staging" ]
+    tags: [ "staging" ]
     run_on:
       - rhel90-large
     tasks:
@@ -1808,7 +1807,7 @@ buildvariants:
     # It will be called by pct while bumping the agent cloud manager image
   - name: release_agent
     display_name: release_agent
-    tags: [ "release_agent" ]
+    tags: [ "manual_patch", "release_agent" ]
     run_on:
       - release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
     depends_on:
@@ -1829,7 +1828,7 @@ buildvariants:
     # has not changed, and you still want to push the images to ecr.
   - name: manual_ecr_release_agent
     display_name: Manual Agent Release for all versions
-    tags: [ "release_all_agents_manually" ]
+    tags: [ "manual_patch", "release_all_agents_manually" ]
     run_on:
       - ubuntu2404-large
     tasks:
@@ -1839,7 +1838,7 @@ buildvariants:
     # has not changed, and you still want to push the images to ecr.
   - name: manual_ecr_release_agent_currently_used
     display_name: manual_ecr_release_agent_currently_used
-    tags: [ "release_all_agents_manually" ]
+    tags: [ "manual_patch", "release_all_agents_manually" ]
     run_on:
       - ubuntu2404-large
     tasks:
@@ -1850,6 +1849,7 @@ buildvariants:
     # More details in the TD: https://docs.google.com/document/d/1fuTxfRtP8QPtn7sKYxQM_AGcD6xycTZH8svngGxyKhc/edit?tab=t.0#bookmark=id.e8uva0393mbe
   - name: public_gke_code_snippets
     display_name: public_gke_code_snippets
+    tags: [ "manual_patch" ]
     allowed_requesters: [ "patch" ]
     run_on:
       - ubuntu2404-small
@@ -1858,6 +1858,7 @@ buildvariants:
 
   - name: public_kind_code_snippets
     display_name: public_kind_code_snippets
+    tags: [ "manual_patch" ]
     allowed_requesters: [ "patch" ]
     run_on:
       - ubuntu2404-large
@@ -1866,7 +1867,7 @@ buildvariants:
 
   - name: private_gke_code_snippets
     display_name: private_gke_code_snippets
-    tags: [ "pr_patch", "staging", "e2e_test_suite" ]
+    tags: [ "staging", "e2e_test_suite" ]
     allowed_requesters: [ "patch" ]
     run_on:
       - ubuntu2404-small
@@ -1888,6 +1889,7 @@ buildvariants:
 
   - name: backup_csv_images
     display_name: "Backup CSV Images"
+    tags: [ "manual_patch" ]
     allowed_requesters: [ "patch" ]
     run_on:
       - ubuntu2404-small
@@ -1898,6 +1900,7 @@ buildvariants:
 
   - name: publish_om60_images
     display_name: publish_om60_images
+    tags: [ "manual_patch" ]
     allowed_requesters: [ "patch", "github_pr" ]
     run_on:
       - release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
@@ -1912,6 +1915,7 @@ buildvariants:
 
   - name: publish_om70_images
     display_name: publish_om70_images
+    tags: [ "manual_patch" ]
     allowed_requesters: [ "patch", "github_pr" ]
     run_on:
       - release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
@@ -1926,6 +1930,7 @@ buildvariants:
 
   - name: publish_om80_images
     display_name: publish_om80_images
+    tags: [ "manual_patch" ]
     allowed_requesters: [ "patch", "github_pr" ]
     run_on:
       - release-ubuntu2404-small # This is required for CISA attestation https://jira.mongodb.org/browse/DEVPROD-17780
@@ -1940,6 +1945,7 @@ buildvariants:
 
   - name: migrate_all_agents
     display_name: migrate_all_agents
+    tags: [ "manual_patch" ]
     allowed_requesters: [ "patch" ]
     run_on:
       - ubuntu2404-large

From 83b3921c7098da623671a58a4869811cf381e681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kara=C5=9B?= <maciej.karas@mongodb.com>
Date: Mon, 8 Sep 2025 22:22:01 +0200
Subject: [PATCH 4/5] Fixes after internal review v2

---
 .evergreen-tasks.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.evergreen-tasks.yml b/.evergreen-tasks.yml
index 9e80da272..b5366b2a0 100644
--- a/.evergreen-tasks.yml
+++ b/.evergreen-tasks.yml
@@ -77,7 +77,6 @@ tasks:
     commands:
       - func: test_code_snippets
       - func: sample_commit_output
-      - func: sample_commit_output
 
   - name: task_gke_multi_cluster_no_mesh_snippets
     tags: [ "code_snippets" ]

From cf0eb382207e46123bb271ee0df99922d2d5c376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kara=C5=9B?= <maciej.karas@mongodb.com>
Date: Tue, 9 Sep 2025 14:48:58 +0200
Subject: [PATCH 5/5] Rename changed context filename

---
 ...tatic_mdb_ubi_cloudqa => e2e_static_openshift_mdb_ubi_cloudqa} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename scripts/dev/contexts/{e2e_openshift_static_mdb_ubi_cloudqa => e2e_static_openshift_mdb_ubi_cloudqa} (100%)

diff --git a/scripts/dev/contexts/e2e_openshift_static_mdb_ubi_cloudqa b/scripts/dev/contexts/e2e_static_openshift_mdb_ubi_cloudqa
similarity index 100%
rename from scripts/dev/contexts/e2e_openshift_static_mdb_ubi_cloudqa
rename to scripts/dev/contexts/e2e_static_openshift_mdb_ubi_cloudqa