diff options
| author | Tor Egge <Tor.Egge@yahooinc.com> | 2022-12-01 14:16:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-01 14:16:47 +0100 |
| commit | a2be328946052c79202d13a45ae1d61b129a340b (patch) | |
| tree | 3773ebdf5e0f5a49e6c2e772a1696992f55ddbf6 /screwdriver.yaml | |
| parent | d5eebbac4c6df13ce2f5f6ab3dbd000114cf7117 (diff) | |
| parent | 14f45dd614748d7bc1402e892680372318abd867 (diff) | |
Merge pull request #25071 from vespa-engine/toregge/add-vespa-cmake-sanitizers-option-setting-for-screwdriver-build
Add VESPA_CMAKE_SANITIZERS_OPTION variable for screwdriver build.
Diffstat (limited to 'screwdriver.yaml')
| -rw-r--r-- | screwdriver.yaml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/screwdriver.yaml b/screwdriver.yaml index d9716f438bb..f1a0a89263f 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -133,10 +133,11 @@ jobs: cd $WORKDIR/vespa export FACTORY_VESPA_VERSION=$VESPA_VERSION NUM_THREADS=$(( $(nproc) + 2 )) + VESPA_CMAKE_SANITIZERS_OPTION="" time make -C client/go BIN=$WORKDIR/vespa-install/opt/vespa/bin SHARE=$WORKDIR/vespa-install/usr/share install-all time ./bootstrap.sh java time mvn -T $NUM_THREADS $VESPA_MAVEN_EXTRA_OPTS install - cmake3 -DVESPA_UNPRIVILEGED=no . + cmake3 -DVESPA_UNPRIVILEGED=no $VESPA_CMAKE_SANITIZERS_OPTION . time make -j ${NUM_THREADS} time ctest3 --output-on-failure -j ${NUM_THREADS} ccache --show-stats @@ -149,7 +150,10 @@ jobs: --define "installdir $WORKDIR/vespa-install" *.src.rpm mkdir -p $WORKDIR/system-test/docker/rpms mv $WORKDIR/vespa-rpmbuild/RPMS/x86_64/*.rpm $WORKDIR/system-test/docker/rpms - rm -f $WORKDIR/system-test/docker/rpms/*debuginfo*rpm + if test -z "$VESPA_CMAKE_SANITIZERS_OPTION" + then + rm -f $WORKDIR/system-test/docker/rpms/*debuginfo*rpm + fi ls -la $WORKDIR/system-test/docker/rpms - build-test-image: | cd $WORKDIR/system-test |