diff options
author | Mikhail Shchatko <mikhail.shchatko@mongodb.com> | 2022-02-15 08:24:01 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-02-15 08:51:14 +0000 |
commit | 7bd6a08e6ed1f308cba776cb1c71d9ccb3c0dfbe (patch) | |
tree | 0adcce63d973897c807ac38deb71b5f2efc6a9ef /evergreen | |
parent | d02536f48aee7593077c12b1e60829b9441a7c08 (diff) | |
download | mongo-7bd6a08e6ed1f308cba776cb1c71d9ccb3c0dfbe.tar.gz |
SERVER-61686 Fix multiversion tags in burn_in_tests
Diffstat (limited to 'evergreen')
-rwxr-xr-x | evergreen/burn_in_tests.sh | 7 | ||||
-rw-r--r-- | evergreen/burn_in_tests_generate.sh | 7 | ||||
-rw-r--r-- | evergreen/implicit_multiversions_tasks_generate.sh | 13 | ||||
-rw-r--r-- | evergreen/multiversion_exclude_tags_generate.sh | 19 |
4 files changed, 23 insertions, 23 deletions
diff --git a/evergreen/burn_in_tests.sh b/evergreen/burn_in_tests.sh index 69beb2a7713..23ac58851d4 100755 --- a/evergreen/burn_in_tests.sh +++ b/evergreen/burn_in_tests.sh @@ -5,14 +5,11 @@ cd src set -o errexit set -o verbose -activate_venv -# Multiversion exclusions can be used when selecting tests. -PATH="$PATH:/data/multiversion" -$python buildscripts/resmoke.py generate-multiversion-exclude-tags --oldBinVersion=last_continuous --excludeTagsFilePath=multiversion_exclude_tags.yml +activate_venv # Capture a list of new and modified tests. The expansion macro burn_in_tests_build_variant -# is used to for finding the associated tasks from a different build varaint than the +# is used to for finding the associated tasks from a different build variant than the # burn_in_tests_gen task executes on. build_variant_opts="--build-variant=${build_variant}" if [ -n "${burn_in_tests_build_variant}" ]; then diff --git a/evergreen/burn_in_tests_generate.sh b/evergreen/burn_in_tests_generate.sh index acd394b91a2..639a18e0045 100644 --- a/evergreen/burn_in_tests_generate.sh +++ b/evergreen/burn_in_tests_generate.sh @@ -4,12 +4,9 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" cd src set -o errexit +set -o verbose activate_venv -# Multiversion exclusions can be used when selecting tests. -PATH="$PATH:/data/multiversion" -$python buildscripts/resmoke.py generate-multiversion-exclude-tags --oldBinVersion=last_continuous --excludeTagsFilePath=multiversion_exclude_tags_last_continuous.yml -$python buildscripts/resmoke.py generate-multiversion-exclude-tags --oldBinVersion=last_lts --excludeTagsFilePath=multiversion_exclude_tags_last_lts.yml - +# Evergreen executable is in $HOME. PATH=$PATH:$HOME $python buildscripts/burn_in_tags.py --expansion-file ../expansions.yml diff --git a/evergreen/implicit_multiversions_tasks_generate.sh b/evergreen/implicit_multiversions_tasks_generate.sh deleted file mode 100644 index 78eb852eccd..00000000000 --- a/evergreen/implicit_multiversions_tasks_generate.sh +++ /dev/null @@ -1,13 +0,0 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" -. "$DIR/prelude.sh" - -cd src - -set -o errexit - -activate_venv -PATH="$PATH:/data/multiversion" - -if [[ "${require_multiversion_setup}" = "true" && -n "${multiversion_exclude_tags_version}" ]]; then - $python buildscripts/resmoke.py generate-multiversion-exclude-tags --oldBinVersion="${multiversion_exclude_tags_version}" -fi diff --git a/evergreen/multiversion_exclude_tags_generate.sh b/evergreen/multiversion_exclude_tags_generate.sh new file mode 100644 index 00000000000..71ed97f3ce5 --- /dev/null +++ b/evergreen/multiversion_exclude_tags_generate.sh @@ -0,0 +1,19 @@ +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" +. "$DIR/prelude.sh" + +cd src + +set -o errexit +set -o verbose + +activate_venv +PATH="$PATH:/data/multiversion" + +if [[ "${require_multiversion_setup}" = "true" && -n "${multiversion_exclude_tags_version}" ]]; then + exclude_tags_file_path_arg="" + if [ ! -d generated_resmoke_config ]; then + exclude_tags_file_path_arg="--excludeTagsFilePath=multiversion_exclude_tags.yml" + fi + + eval $python buildscripts/resmoke.py generate-multiversion-exclude-tags --oldBinVersion="${multiversion_exclude_tags_version}" "$exclude_tags_file_path_arg" +fi |