From b3819d2c6a3d48ae7c1a05fe7fb2f89ca4243ede Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Tue, 3 Mar 2020 12:28:26 +0100 Subject: contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1 Some jenkins slaves may not need docker (or even have it installed). Change-Id: Ibfc4a81d3d621503b40204b7452ead56c726af97 --- contrib/jenkins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 275fc69..3ab942a 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -10,6 +10,6 @@ git fetch && git checkout -f -B master origin/master git rev-parse HEAD git status -if [ `uname` = "Linux" ]; then +if [ `uname` = "Linux" ] && [ "x${OSMO_CI_NO_DOCKER}" != "x1" ]; then scripts/osmo-ci-docker-rebuild.sh fi -- cgit v1.2.3