diff options
| author | Robert Guo <robert.guo@mongodb.com> | 2021-10-12 04:23:31 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-10-12 04:46:33 +0000 |
| commit | 9c46c72e17e11a31089342abc9f56348aeaf4b87 (patch) | |
| tree | 853197a50430b0a4a54139403e6f55405d9e61c6 /evergreen | |
| parent | b9e2784da82fef8e45b95b88e4ac1443649a5b0c (diff) | |
| download | mongo-9c46c72e17e11a31089342abc9f56348aeaf4b87.tar.gz | |
SERVER-55857 Use explicit task definitions for implicit multiversion tasks
Diffstat (limited to 'evergreen')
| -rwxr-xr-x | evergreen/burn_in_tests_multiversion.sh | 22 | ||||
| -rw-r--r-- | evergreen/generate_build_variant.sh | 2 | ||||
| -rw-r--r-- | evergreen/implicit_multiversions_tasks_generate.sh | 4 |
3 files changed, 4 insertions, 24 deletions
diff --git a/evergreen/burn_in_tests_multiversion.sh b/evergreen/burn_in_tests_multiversion.sh deleted file mode 100755 index 6179de2e2ea..00000000000 --- a/evergreen/burn_in_tests_multiversion.sh +++ /dev/null @@ -1,22 +0,0 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" -. "$DIR/prelude.sh" - -cd src - -set -o errexit -set -o verbose - -activate_venv -# Capture a list of new and modified tests. The expansion macro burn_in_tests_build_variant -# is used for finding the associated tasks from a different build variant than the -# burn_in_tests_multiversion_gen task executes on. -build_variant_opts="--build-variant=${build_variant}" -if [ -n "${burn_in_tests_build_variant}" ]; then - build_variant_opts="--build-variant=${burn_in_tests_build_variant} --run-build-variant=${build_variant}" -fi - -burn_in_args="$burn_in_args" -# Evergreen executable is in $HOME. -PATH="$PATH:$HOME" eval $python buildscripts/burn_in_tests_multiversion.py --task_id=${task_id} --project=${project} $build_variant_opts --distro=${distro_id} --generate-tasks-file=burn_in_tests_multiversion_gen.json $burn_in_args --verbose --revision=${revision} --build-id=${build_id} -PATH="$PATH:/data/multiversion" -$python buildscripts/resmoke.py generate-multiversion-exclude-tags --oldBinVersion=last_continuous diff --git a/evergreen/generate_build_variant.sh b/evergreen/generate_build_variant.sh index f975c84f9a8..e9529ef1a74 100644 --- a/evergreen/generate_build_variant.sh +++ b/evergreen/generate_build_variant.sh @@ -5,6 +5,8 @@ cd src set -o errexit +cat ../expansions.yml + activate_venv PATH=$PATH:$HOME:/ $python buildscripts/evergreen_gen_build_variant.py \ --expansion-file ../expansions.yml \ diff --git a/evergreen/implicit_multiversions_tasks_generate.sh b/evergreen/implicit_multiversions_tasks_generate.sh index f39e003604c..0ca5e14a951 100644 --- a/evergreen/implicit_multiversions_tasks_generate.sh +++ b/evergreen/implicit_multiversions_tasks_generate.sh @@ -8,7 +8,7 @@ set -o errexit activate_venv PATH="$PATH:/data/multiversion" -# TODO: remove this file and generate tags at execution time for suites defined in multiversion/ -if [ -n "${require_multiversion}" ]; then +# TODO SERVER-55857: remove this file and generate tags at execution time for suites defined in multiversion/ +if [[ "${require_multiversion_setup}" = "true" ]]; then $python buildscripts/resmoke.py generate-multiversion-exclude-tags --oldBinVersion=last_continuous fi |