summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrevor Guidry <trevor.guidry@mongodb.com>2023-08-25 19:32:38 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2023-08-25 22:06:58 +0000
commitea4b0615835de8e8b8a912aa76e6c39d55d11c5e (patch)
tree6fd8376ce6a6cd0f629114269be7c239be162d99
parentf5bc4af8a9c424f7a4172601900cb0302be4133b (diff)
SERVER-80435 add package task back to windows and macos nightly variantsr7.1.0-alpha0
-rw-r--r--etc/evergreen_yml_components/variants/misc_release.yml12
-rw-r--r--evergreen/packager.py_run.sh6
2 files changed, 10 insertions, 8 deletions
diff --git a/etc/evergreen_yml_components/variants/misc_release.yml b/etc/evergreen_yml_components/variants/misc_release.yml
index ff5a9171af2..01094a6acca 100644
--- a/etc/evergreen_yml_components/variants/misc_release.yml
+++ b/etc/evergreen_yml_components/variants/misc_release.yml
@@ -2372,7 +2372,7 @@ buildvariants:
test_flags: &windows_common_test_excludes --excludeWithAnyTags=incompatible_with_windows_tls,requires_external_data_source,requires_latch_analyzer
compile_variant: windows
tasks:
- - name: compile_test_serial_no_unittests_TG
+ - name: compile_test_and_package_serial_no_unittests_TG
distros:
- windows-vsCurrent-large
- name: .aggfuzzer !.feature_flag_guarded
@@ -2447,7 +2447,7 @@ buildvariants:
exec_timeout_secs: 14400 # 3 hour timeout
compile_variant: enterprise-windows
tasks:
- - name: compile_test_serial_TG
+ - name: compile_test_and_package_serial_TG
distros:
- windows-vsCurrent-large
- name: .aggfuzzer !.feature_flag_guarded
@@ -2507,7 +2507,7 @@ buildvariants:
resmoke_jobs_max: 6
compile_variant: macos
tasks:
- - name: compile_test_serial_TG
+ - name: compile_test_and_package_serial_TG
- name: compile_build_tools_next_TG
- name: .aggregation !.auth !.encrypt !.unwind !.feature_flag_guarded
- name: auth_gen
@@ -2559,7 +2559,7 @@ buildvariants:
resmoke_jobs_max: 6
compile_variant: macos-arm64
tasks:
- - name: compile_test_serial_TG
+ - name: compile_test_and_package_serial_TG
- name: compile_build_tools_next_TG
- name: .aggregation !.auth !.encrypt !.unwind !.feature_flag_guarded
- name: auth_gen
@@ -2618,7 +2618,7 @@ buildvariants:
resmoke_jobs_max: 6
compile_variant: enterprise-macos
tasks:
- - name: compile_test_serial_TG
+ - name: compile_test_and_package_serial_TG
- name: compile_build_tools_next_TG
- name: audit
- name: auth_audit_gen
@@ -2662,7 +2662,7 @@ buildvariants:
resmoke_jobs_max: 6
compile_variant: enterprise-macos-arm64
tasks:
- - name: compile_test_serial_TG
+ - name: compile_test_and_package_serial_TG
- name: compile_build_tools_next_TG
- name: audit
- name: auth_audit_gen
diff --git a/evergreen/packager.py_run.sh b/evergreen/packager.py_run.sh
index 246dbc9ea87..4ed7c0b022d 100644
--- a/evergreen/packager.py_run.sh
+++ b/evergreen/packager.py_run.sh
@@ -8,8 +8,10 @@ set -o verbose
activate_venv
if [ "${has_packages}" != "true" ]; then
- echo "Error: packager run when has_packages is not set to true, please remove the package task from this variant (or variant task group) or set has_packages to true if this variant is intended to run the packager."
- exit 1
+ exit 0
+ # TODO: SERVER-80443 add back validation
+ # echo "Error: packager run when has_packages is not set to true, please remove the package task from this variant (or variant task group) or set has_packages to true if this variant is intended to run the packager."
+ # exit 1
fi
cd buildscripts