SERVER-71249: set .publish tasks to always run on rhel80-small

5 files changed, 1 insertions, 102 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index c1571745fd1..e3584cf8888 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -193,8 +193,6 @@ variables:
     - ubuntu2004-package
   - name: selinux_rhel7_enterprise
   - name: .publish
-    distros:
-    - rhel70-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 
@@ -1218,12 +1216,8 @@ buildvariants:
   - name: replica_sets_jscore_passthrough
   - name: sasl
   - name: push
-    distros:
-    - rhel70-small
   - name: .crypt
   - name: .publish_crypt
-    distros:
-    - rhel70-small
 
 ###########################################
 #          Embedded SDK buildvariants     #
diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml
index 4c21918ebc7..0ab5a3b4ddc 100644
--- a/etc/evergreen_yml_components/definitions.yml
+++ b/etc/evergreen_yml_components/definitions.yml
@@ -6688,6 +6688,7 @@ tasks:
 
 
 - name: publish_packages
+  run_on: rhel80-small
   tags: ["publish"]
   # This should prevent this task from running in patch builds, where we
   # don't want to publish packages.
diff --git a/etc/evergreen_yml_components/variants/atlas.yml b/etc/evergreen_yml_components/variants/atlas.yml
index 982aca93761..7ab2ee903bd 100644
--- a/etc/evergreen_yml_components/variants/atlas.yml
+++ b/etc/evergreen_yml_components/variants/atlas.yml
@@ -75,6 +75,4 @@ buildvariants:
     - ubuntu2004-package
   - name: selinux_rhel7_enterprise
   - name: .publish
-    distros:
-    - rhel70-small
   - name: generate_buildid_to_debug_symbols_mapping
diff --git a/etc/evergreen_yml_components/variants/ibm.yml b/etc/evergreen_yml_components/variants/ibm.yml
index 2251bdd2981..bd2fd978b75 100644
--- a/etc/evergreen_yml_components/variants/ibm.yml
+++ b/etc/evergreen_yml_components/variants/ibm.yml
@@ -50,11 +50,7 @@ buildvariants:
   - name: .stitch
   - name: .crypt
   - name: .publish_crypt
-    distros:
-    - rhel70-small
   - name: .publish
-    distros:
-    - rhel70-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-rhel-72-s390x
@@ -106,11 +102,7 @@ buildvariants:
   - name: .stitch
   - name: .crypt
   - name: .publish_crypt
-    distros:
-    - rhel70-small
   - name: .publish
-    distros:
-    - rhel70-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-rhel-83-s390x
@@ -162,9 +154,5 @@ buildvariants:
   - name: .stitch
   - name: .crypt
   - name: .publish_crypt
-    distros:
-    - rhel80-small
   - name: .publish
-    distros:
-    - rhel80-small
   - name: generate_buildid_to_debug_symbols_mapping
diff --git a/etc/evergreen_yml_components/variants/misc_release.yml b/etc/evergreen_yml_components/variants/misc_release.yml
index 593f636ad5e..f1c4ed06b69 100644
--- a/etc/evergreen_yml_components/variants/misc_release.yml
+++ b/etc/evergreen_yml_components/variants/misc_release.yml
@@ -160,8 +160,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - amazon2-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-amazon2
@@ -220,8 +218,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - amazon2-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: amazon2-arm64
@@ -270,8 +266,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - rhel80-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-amazon2-arm64
@@ -380,8 +374,6 @@ buildvariants:
     distros:
     - amazon2-arm64-large
   - name: .publish_crypt
-    distros:
-    - amazon2-arm64-large
   - name: secondary_reads_passthrough_gen
   - name: server_discovery_and_monitoring_json_test_TG
   - name: .serverless
@@ -394,8 +386,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - rhel80-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: debian10
@@ -448,8 +438,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - debian10-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-debian10-64
@@ -504,8 +492,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - debian10-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: debian11
@@ -558,8 +544,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - debian11-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-debian11-64
@@ -614,8 +598,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - debian11-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: rhel70
@@ -667,8 +649,6 @@ buildvariants:
     - ubuntu2004-package
   - name: selinux_rhel7_org
   - name: .publish
-    distros:
-    - rhel70-small
   - name: generate_buildid_to_debug_symbols_mapping
 
   # This variant compiles on RHEL 7.0 and runs tests on RHEL 7.6
@@ -756,8 +736,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - rhel80-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-rhel-80-64-bit
@@ -921,8 +899,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - rhel80-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-rhel-82-arm64
@@ -981,8 +957,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - rhel80-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: rhel90
@@ -1033,8 +1007,6 @@ buildvariants:
     - ubuntu2004-package
   - name: selinux_rhel9_org
   - name: .publish
-    distros:
-    - rhel80-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 
@@ -1112,8 +1084,6 @@ buildvariants:
     - ubuntu2004-package
   - name: selinux_rhel9_enterprise
   - name: .publish
-    distros:
-    - rhel80-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: suse12
@@ -1163,8 +1133,6 @@ buildvariants:
   - name: .ssl
   - name: .stitch
   - name: .publish
-    distros:
-    - suse12-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-suse12-64
@@ -1213,8 +1181,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - suse12-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-suse15-64
@@ -1258,8 +1224,6 @@ buildvariants:
   - name: .crypt
   - name: .publish_crypt
   - name: .publish
-    distros:
-    - suse15-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: suse15
@@ -1308,8 +1272,6 @@ buildvariants:
   - name: .ssl
   - name: .stitch
   - name: .publish
-    distros:
-    - suse15-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 
@@ -1367,8 +1329,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu1804-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-ubuntu1804-64
@@ -1437,8 +1397,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu1804-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-ubuntu1804-arm64
@@ -1490,14 +1448,10 @@ buildvariants:
   - name: .stitch
   - name: .crypt
   - name: .publish_crypt
-    distros:
-    - ubuntu1804-test
   - name: test_packages
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu1804-test
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: ubuntu1804-arm64
@@ -1532,8 +1486,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu1804-test
   - name: generate_buildid_to_debug_symbols_mapping
 
 
@@ -1585,8 +1537,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu2204-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 
@@ -1638,8 +1588,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu2004-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-ubuntu2004-64
@@ -1694,8 +1642,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu2004-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-ubuntu2204-64
@@ -1750,8 +1696,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu2204-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-ubuntu2004-arm64
@@ -1806,8 +1750,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu2004-test
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: ubuntu2004-arm64
@@ -1841,8 +1783,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu2004-test
   - name: generate_buildid_to_debug_symbols_mapping
 
 
@@ -1898,8 +1838,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu2204-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: ubuntu2204-arm64
@@ -1933,8 +1871,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu2204-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: windows
@@ -1994,8 +1930,6 @@ buildvariants:
   - name: .stitch
   - name: .updatefuzzer
   - name: push
-    distros:
-    - rhel70-small
 
 - name: enterprise-windows
   display_name: "Enterprise Windows"
@@ -2044,8 +1978,6 @@ buildvariants:
     distros:
     - windows-vsCurrent-large
   - name: .publish_crypt
-    distros:
-    - rhel70-small
   - name: disk_wiredtiger
   - name: .jscore .common !.auth
   - name: json_schema
@@ -2064,8 +1996,6 @@ buildvariants:
   - name: .stitch
   - name: .updatefuzzer
   - name: push
-    distros:
-    - rhel70-small
 
   ###########################################
   #           macOS buildvariants           #
@@ -2118,8 +2048,6 @@ buildvariants:
   - name: .stitch
   - name: unittest_shell_hang_analyzer_gen
   - name: push
-    distros:
-    - rhel70-small
 
 - name: macos-arm64
   display_name: macOS arm64
@@ -2169,8 +2097,6 @@ buildvariants:
   - name: .stitch
   - name: unittest_shell_hang_analyzer_gen
   - name: push
-    distros:
-    - rhel70-small
 
 - name: enterprise-macos
   display_name: Enterprise macOS
@@ -2205,12 +2131,8 @@ buildvariants:
   - name: replica_sets_jscore_passthrough
   - name: sasl
   - name: push
-    distros:
-    - rhel70-small
   - name: .crypt
   - name: .publish_crypt
-    distros:
-    - rhel70-small
 
 - name: enterprise-macos-arm64
   display_name: Enterprise macOS arm64
@@ -2244,9 +2166,5 @@ buildvariants:
   - name: replica_sets_jscore_passthrough
   - name: sasl
   - name: push
-    distros:
-    - rhel70-small
   - name: .crypt
   - name: .publish_crypt
-    distros:
-    - rhel70-small