diff options
| author | Andrew Morrow <acm@mongodb.com> | 2021-02-23 13:04:48 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-02-24 05:37:03 +0000 |
| commit | abb82fc8a440587a3d9d1ee9cc7926a9dfba282a (patch) | |
| tree | 97e347010d6475c78200115dda32aaff7c2bc7d6 | |
| parent | 6979525674af67405984c58585766dd4d0c3f2a8 (diff) | |
| download | mongo-abb82fc8a440587a3d9d1ee9cc7926a9dfba282a.tar.gz | |
SERVER-54700 Allow customizing patch compile flags via parameterized builds
| -rw-r--r-- | etc/evergreen.yml | 7 | ||||
| -rw-r--r-- | etc/perf.yml | 7 | ||||
| -rwxr-xr-x | etc/system_perf.yml | 7 |
3 files changed, 18 insertions, 3 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index eac64ac6118..7896d83c0d1 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -40,6 +40,11 @@ ignore: - "!/etc/evergreen.yml" - "README" +## Parameters for parameterized builds (see https://github.com/evergreen-ci/evergreen/wiki/Parameterized-Builds) +parameters: + - key: patch_compile_flags + description: "Additional SCons flags to be applied during scons compile invocations in this patch" + ## Some variables for convenience: variables: @@ -1893,7 +1898,7 @@ functions: ${compile_env|} $python ./buildscripts/scons.py \ ${compile_flags|} ${task_compile_flags|} ${task_compile_flags_extra|} \ ${scons_cache_args|} $extra_args \ - ${targets} MONGO_VERSION=${version} || exit_status=$? + ${targets} MONGO_VERSION=${version} ${patch_compile_flags|} || exit_status=$? chmod -R ugo+w ./src ls -la src/mongo/stdx/sigaltstack_location_test.cpp || true diff --git a/etc/perf.yml b/etc/perf.yml index 7d298c681ab..1b1642df296 100644 --- a/etc/perf.yml +++ b/etc/perf.yml @@ -1,6 +1,11 @@ command_type: system stepback: false +## Parameters for parameterized builds (see https://github.com/evergreen-ci/evergreen/wiki/Parameterized-Builds) +parameters: + - key: patch_compile_flags + description: "Additional SCons flags to be applied during scons compile invocations in this patch" + variables: ### # Leave this section uncommented to enable compile. @@ -337,7 +342,7 @@ functions: set -o errexit set -o verbose source "${workdir}/compile_venv/bin/activate" - python ./buildscripts/scons.py ${compile_flags|} ${scons_cache_args|} install-core MONGO_VERSION=${version} DESTDIR=$(pwd)/mongodb + python ./buildscripts/scons.py ${compile_flags|} ${scons_cache_args|} install-core MONGO_VERSION=${version} DESTDIR=$(pwd)/mongodb ${patch_compile_flags|} mkdir -p mongodb/jstests/hooks if [ -d jstests/hooks ] then diff --git a/etc/system_perf.yml b/etc/system_perf.yml index a800be1ead7..311019972ab 100755 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -1,6 +1,11 @@ command_type: system stepback: false +## Parameters for parameterized builds (see https://github.com/evergreen-ci/evergreen/wiki/Parameterized-Builds) +parameters: + - key: patch_compile_flags + description: "Additional SCons flags to be applied during scons compile invocations in this patch" + variables: ### # Leave this section uncommented to enable compile. @@ -342,7 +347,7 @@ functions: set -o errexit set -o verbose source "${workdir}/compile_venv/bin/activate" - python ./buildscripts/scons.py ${compile_flags|} ${scons_cache_args|} install-core MONGO_VERSION=${version} DESTDIR=$(pwd)/mongodb + python ./buildscripts/scons.py ${compile_flags|} ${scons_cache_args|} install-core MONGO_VERSION=${version} DESTDIR=$(pwd)/mongodb ${patch_compile_flags|} mkdir -p mongodb/jstests/hooks if [ -d jstests/hooks ] then |