X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jenkins-scripts%2Fdocker.sh;h=d8963184cb5017fc49366cdeb0968e4f6bfa821c;hb=112c8b8522c05a2e7e1cdafd6dd15893033045dc;hp=c3498df4182999d341ba459eef4ea96c4662a731;hpb=14d7fcf3da27050fea1c8a5aeff0fa23f92767fd;p=releng%2Fbuilder.git

diff --git a/jenkins-scripts/docker.sh b/jenkins-scripts/docker.sh
index c3498df41..d8963184c 100755
--- a/jenkins-scripts/docker.sh
+++ b/jenkins-scripts/docker.sh
@@ -1,12 +1,17 @@
 #!/bin/bash
 
-/usr/sbin/usermod -a -G docker jenkins
+# 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: ALL
+EOF
 
-# stop firewall
-systemctl stop firewalld
+# make sure jenkins is part of the docker only if jenkins has already been
+# created
 
-# 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 :
-