Skip to content

Commit 836b883

Browse files
committed
Try again in serial if tests fail in parallel
Many of the upstream tests are really resource intensive, so if they fail while running in parallel on a given host, chances are decent they'll pass in serial, so we should fall back once before we give up.
1 parent e684688 commit 836b883

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

1/alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

1/debian/Dockerfile

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ RUN set -eux; \
106106
# see https://github.com/docker-library/memcached/pull/54#issuecomment-562797748 and https://bugs.debian.org/927461 for why we have to munge openssl.cnf
107107
sed -i.bak 's/SECLEVEL=2/SECLEVEL=1/g' /etc/ssl/openssl.cnf; \
108108
{{ ) else "" end -}}
109-
make test PARALLEL="$nproc"; \
109+
# try the tests in parallel first, but many of them are resource-intensive, so fall back to serial
110+
make test PARALLEL="$nproc" || make test; \
110111
{{ if env.variant == "debian" then ( -}}
111112
mv /etc/ssl/openssl.cnf.bak /etc/ssl/openssl.cnf; \
112113
{{ ) else "" end -}}

0 commit comments

Comments
 (0)