X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jenkins-scripts%2Fdocker.sh;h=d8963184cb5017fc49366cdeb0968e4f6bfa821c;hb=fee730e378c29833969b49e210a26ed5414279eb;hp=365dc9574d52a63c4162767bad93995b4149ed1e;hpb=d181265f0cc4f649fe1c2e35790f1f68f48b66af;p=releng%2Fbuilder.git

diff --git a/jenkins-scripts/docker.sh b/jenkins-scripts/docker.sh
index 365dc9574..d8963184c 100755
--- a/jenkins-scripts/docker.sh
+++ b/jenkins-scripts/docker.sh
@@ -3,16 +3,15 @@
 # make sure we don't require tty for sudo operations
 cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
 Defaults:jenkins !requiretty
-jenkins     ALL = NOPASSWD: /sbin/ifconfig
+jenkins     ALL = NOPASSWD: ALL
 EOF
 
-/usr/sbin/usermod -a -G docker jenkins
+# make sure jenkins is part of the docker only if jenkins has already been
+# created
 
-# stop firewall
-systemctl stop firewalld
-
-# restart docker daemon - needed after firewalld stop
-systemctl restart docker
+if grep -q jenkins /etc/passwd
+then
+  /usr/sbin/usermod -a -G docker jenkins
+fi
 
 # vim: sw=2 ts=2 sts=2 et :
-