diff options
| author | Harald Musum <musum@verizonmedia.com> | 2023-01-02 22:49:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-02 22:49:21 +0100 |
| commit | 470e303a873bece667965f6d20f2b6c5fa98e537 (patch) | |
| tree | 2fe54ea7104f595fbb892f9b2c78ba8c6cb91eb3 | |
| parent | 98933f7cd7ee770d36533cd13f60ed35dbbbb9dc (diff) | |
| parent | 59f45e5586f6353e4b1ed1d510640c26753f0a19 (diff) | |
Merge pull request #25358 from vespa-engine/revert-25352-toregge/temporarily-enable-thread-sanitizer-for-screwdriver-builds-round-4v8.104.21
Revert "Temporarily enable thread sanitizer for screwdriver builds (round 4)."
| -rw-r--r-- | screwdriver.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/screwdriver.yaml b/screwdriver.yaml index cab0a661b06..182abb95968 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 @@ -135,7 +135,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 |