summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2023-01-02 14:45:04 +0100
committerGitHub <noreply@github.com>2023-01-02 14:45:04 +0100
commit59f45e5586f6353e4b1ed1d510640c26753f0a19 (patch)
treef39b940bc121733bf607feb1a3d89a772fec8aa6
parent6a60c1ff36703f609af9313613fb04e8be529511 (diff)
Revert "Temporarily enable thread sanitizer for screwdriver builds (round 4)."
-rw-r--r--screwdriver.yaml4
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