Skip to content

Commit cd20455

Browse files
committed
Turns out x2large is not available :(. Increase output timeout.
force push to fix DCO Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
1 parent 7c365fe commit cd20455

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.circleci/config.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ jobs:
5757
resource_class: xlarge
5858
steps:
5959
- checkout
60-
- run: ci/do_ci.sh asan
60+
- run:
61+
command: ci/do_ci.sh asan
62+
no_output_timeout: 30m
6163
tsan:
6264
docker:
6365
- image: *envoy-build-image

ci/do_ci.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,11 @@ if [ -n "$CIRCLECI" ]; then
186186
# Asan has huge memory requirements in its link steps.
187187
# As of the new coverage methodology introduced in Envoy, that has grown memory requirements too.
188188
# Hence we heavily reduce parallellism, to avoid being OOM killed.
189-
if [[ "$1" == "asan" ]] || [[ "$1" == "coverage" ]]; then
189+
if [[ "$1" == "coverage" ]]; then
190+
NUM_CPUS=4
191+
elif [[ "$1" == "asan" ]]; then
190192
NUM_CPUS=3
191-
else
193+
else
192194
NUM_CPUS=8
193195
fi
194196
fi

0 commit comments

Comments
 (0)