diff options
| author | David Bradford <david.bradford@mongodb.com> | 2021-06-11 19:43:08 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-07-07 19:38:59 +0000 |
| commit | f7af7fe8600b5245bdfefd03081948a7525d39f4 (patch) | |
| tree | f294aaa7c46f5ce157ef1e45f9e5ad8d1b588afe /evergreen | |
| parent | 25e6b31298e882b06b4afb6c72ada5d22e9aaeec (diff) | |
| download | mongo-f7af7fe8600b5245bdfefd03081948a7525d39f4.tar.gz | |
SERVER-57003: Generate resmoke tasks at build variant granularity
Diffstat (limited to 'evergreen')
| -rw-r--r-- | evergreen/gen_tasks_activate.sh (renamed from evergreen/fuzzer_tasks_generate.sh) | 3 | ||||
| -rw-r--r-- | evergreen/generate_build_variant.sh | 13 | ||||
| -rw-r--r-- | evergreen/implicit_multiversions_tasks_generate.sh | 6 | ||||
| -rw-r--r-- | evergreen/resmoke_tasks_generate.sh | 14 |
4 files changed, 18 insertions, 18 deletions
diff --git a/evergreen/fuzzer_tasks_generate.sh b/evergreen/gen_tasks_activate.sh index 97f1b7024bd..4dee68caee3 100644 --- a/evergreen/fuzzer_tasks_generate.sh +++ b/evergreen/gen_tasks_activate.sh @@ -4,7 +4,6 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" cd src set -o errexit -set -o verbose activate_venv -$python buildscripts/evergreen_gen_fuzzer_tests.py --expansion-file ../expansions.yml +$python buildscripts/evergreen_activate_gen_tasks.py --expansion-file ../expansions.yml --verbose diff --git a/evergreen/generate_build_variant.sh b/evergreen/generate_build_variant.sh new file mode 100644 index 00000000000..3c11c8c1a8c --- /dev/null +++ b/evergreen/generate_build_variant.sh @@ -0,0 +1,13 @@ +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" +. "$DIR/prelude.sh" + +cd src + +set -o errexit + +activate_venv +PATH=$PATH:$HOME $python buildscripts/evergreen_gen_build_variant.py \ + --expansion-file ../expansions.yml \ + --evg-api-config ./.evergreen.yml \ + --output-file ${build_variant}.json \ + --verbose diff --git a/evergreen/implicit_multiversions_tasks_generate.sh b/evergreen/implicit_multiversions_tasks_generate.sh index 11d3426f576..038951e82ac 100644 --- a/evergreen/implicit_multiversions_tasks_generate.sh +++ b/evergreen/implicit_multiversions_tasks_generate.sh @@ -7,5 +7,7 @@ set -o errexit activate_venv PATH="$PATH:/data/multiversion" -$python buildscripts/evergreen_gen_multiversion_tests.py run --expansion-file ../expansions.yml -$python buildscripts/evergreen_gen_multiversion_tests.py generate-exclude-tags + +if [ -n "${require_multiversion}" ]; then + $python buildscripts/evergreen_gen_multiversion_tests.py generate-exclude-tags +fi diff --git a/evergreen/resmoke_tasks_generate.sh b/evergreen/resmoke_tasks_generate.sh deleted file mode 100644 index c4c7f64b0ad..00000000000 --- a/evergreen/resmoke_tasks_generate.sh +++ /dev/null @@ -1,14 +0,0 @@ -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" -. "$DIR/prelude.sh" - -if [ -n "$GENERATE_BUILD_VARIANTS" ]; then - echo "Skipping generation since 'generate_build_variants' is set." - exit 0 -fi - -cd src - -set -o errexit - -activate_venv -$python buildscripts/evergreen_generate_resmoke_tasks.py --expansion-file ../expansions.yml --verbose |