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

5 files changed, 1 insertions, 90 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 06a0186ce69..2e178dc18b8 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -192,8 +192,6 @@ variables:
     - ubuntu2004-package
   - name: selinux_rhel7_enterprise
   - name: .publish
-    distros:
-    - rhel70-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 
@@ -1123,12 +1121,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 fdc9d1316c2..59564d0477a 100644
--- a/etc/evergreen_yml_components/definitions.yml
+++ b/etc/evergreen_yml_components/definitions.yml
@@ -6708,6 +6708,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 660644b7711..cfd2b07161a 100644
--- a/etc/evergreen_yml_components/variants/atlas.yml
+++ b/etc/evergreen_yml_components/variants/atlas.yml
@@ -74,6 +74,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 f20f12c9d5d..e40ebc606a3 100644
--- a/etc/evergreen_yml_components/variants/ibm.yml
+++ b/etc/evergreen_yml_components/variants/ibm.yml
@@ -49,11 +49,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
@@ -104,11 +100,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
@@ -159,9 +151,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 3239b73476b..309a6759349 100644
--- a/etc/evergreen_yml_components/variants/misc_release.yml
+++ b/etc/evergreen_yml_components/variants/misc_release.yml
@@ -159,8 +159,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - amazon2-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-amazon2
@@ -218,8 +216,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - amazon2-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: amazon2-arm64
@@ -268,8 +264,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - rhel80-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-amazon2-arm64
@@ -377,8 +371,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
@@ -391,8 +383,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - rhel80-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: debian10
@@ -445,8 +435,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - debian10-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-debian10-64
@@ -500,8 +488,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - debian10-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: debian11
@@ -554,8 +540,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - debian11-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-debian11-64
@@ -609,8 +593,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - debian11-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: rhel70
@@ -662,8 +644,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
@@ -751,8 +731,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - rhel80-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-rhel-80-64-bit
@@ -915,8 +893,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - rhel80-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-rhel-82-arm64
@@ -974,8 +950,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - rhel80-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: suse12
@@ -1025,8 +999,6 @@ buildvariants:
   - name: .ssl
   - name: .stitch
   - name: .publish
-    distros:
-    - suse12-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-suse12-64
@@ -1074,8 +1046,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - suse12-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-suse15-64
@@ -1118,8 +1088,6 @@ buildvariants:
   - name: .crypt
   - name: .publish_crypt
   - name: .publish
-    distros:
-    - suse15-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: suse15
@@ -1168,8 +1136,6 @@ buildvariants:
   - name: .ssl
   - name: .stitch
   - name: .publish
-    distros:
-    - suse15-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 
@@ -1227,8 +1193,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu1804-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-ubuntu1804-64
@@ -1298,8 +1262,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu1804-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-ubuntu1804-arm64
@@ -1351,14 +1313,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
@@ -1393,8 +1351,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu1804-test
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: ubuntu2004
@@ -1445,8 +1401,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu2004-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-ubuntu2004-64
@@ -1502,8 +1456,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu2004-small
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: enterprise-ubuntu2004-arm64
@@ -1558,8 +1510,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu2004-test
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: ubuntu2004-arm64
@@ -1593,8 +1543,6 @@ buildvariants:
     distros:
     - ubuntu2004-package
   - name: .publish
-    distros:
-    - ubuntu2004-test
   - name: generate_buildid_to_debug_symbols_mapping
 
 - name: windows
@@ -1654,8 +1602,6 @@ buildvariants:
   - name: .stitch
   - name: .updatefuzzer
   - name: push
-    distros:
-    - rhel70-small
 
 - name: enterprise-windows
   display_name: "Enterprise Windows"
@@ -1704,8 +1650,6 @@ buildvariants:
     distros:
     - windows-vsCurrent-large
   - name: .publish_crypt
-    distros:
-    - rhel70-small
   - name: disk_wiredtiger
   - name: .jscore .common !.auth !.feature_flag_guarded
   - name: json_schema
@@ -1724,8 +1668,6 @@ buildvariants:
   - name: .stitch
   - name: .updatefuzzer
   - name: push
-    distros:
-    - rhel70-small
 
   ###########################################
   #           macOS buildvariants           #
@@ -1778,8 +1720,6 @@ buildvariants:
   - name: .stitch
   - name: unittest_shell_hang_analyzer_gen
   - name: push
-    distros:
-    - rhel70-small
 
 - name: macos-arm64
   display_name: macOS arm64
@@ -1829,8 +1769,6 @@ buildvariants:
   - name: .stitch
   - name: unittest_shell_hang_analyzer_gen
   - name: push
-    distros:
-    - rhel70-small
 
 - name: enterprise-macos
   display_name: Enterprise macOS
@@ -1865,12 +1803,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
@@ -1904,9 +1838,5 @@ buildvariants:
   - name: replica_sets_jscore_passthrough
   - name: sasl
   - name: push
-    distros:
-    - rhel70-small
   - name: .crypt
   - name: .publish_crypt
-    distros:
-    - rhel70-small