diff options
| author | Tor Egge <Tor.Egge@yahooinc.com> | 2022-12-03 22:52:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-03 22:52:43 +0100 |
| commit | 1d59603df91f9c1151dcb2b62d611a6da47cae5d (patch) | |
| tree | 62b648297483cf7c27e3a5940cd0e2b1be94bf21 | |
| parent | 2cd144540db9d2921a2cff3559eee33abb9f6c9f (diff) | |
| parent | c1983ff1cdb5f94ececfa49562c182b8b83bc1a7 (diff) | |
Merge pull request #25101 from vespa-engine/revert-25099-toregge/temporarily-enable-thread-sanitizer-for-screwdriver-builds-round-3
Revert "Temporarily enable thread sanitizer for screwdriver builds (round 3)."
| -rw-r--r-- | screwdriver.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/screwdriver.yaml b/screwdriver.yaml index de417277186..f1a0a89263f 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -88,7 +88,7 @@ jobs: screwdriver.cd/cpu: 7 screwdriver.cd/ram: 16 screwdriver.cd/disk: HIGH - screwdriver.cd/timeout: 150 + screwdriver.cd/timeout: 90 screwdriver.cd/dockerEnabled: true screwdriver.cd/dockerCpu: TURBO screwdriver.cd/dockerRam: HIGH @@ -133,7 +133,7 @@ jobs: cd $WORKDIR/vespa export FACTORY_VESPA_VERSION=$VESPA_VERSION NUM_THREADS=$(( $(nproc) + 2 )) - VESPA_CMAKE_SANITIZERS_OPTION="-DVESPA_USE_SANITIZER=thread" + 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 |