Change in osmo-ci[master]: contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17329 )

Change subject: contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1
......................................................................

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
---
M contrib/jenkins.sh
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  pespin: Verified
  osmith: Looks good to me, but someone else must approve
  fixeria: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



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 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

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17329
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ibfc4a81d3d621503b40204b7452ead56c726af97
Gerrit-Change-Number: 17329
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200303/07badc63/attachment.htm>