Fix Netvirt Openstack CSIT failures due to stopping services

[releng/builder.git] / jenkins-scripts / docker.sh

diff --git a/jenkins-scripts/docker.sh b/jenkins-scripts/docker.sh
index 365dc9574d52a63c4162767bad93995b4149ed1e..3f41aac0632b769fa2d4f8fbc0cec08581d2f032 100755 (executable)
--- a/jenkins-scripts/docker.sh
+++ b/jenkins-scripts/docker.sh
@@ -6,13 +6,12 @@ Defaults:jenkins !requiretty
 jenkins     ALL = NOPASSWD: /sbin/ifconfig
 EOF
 
-/usr/sbin/usermod -a -G docker jenkins
-
-# stop firewall
-systemctl stop firewalld
-
-# restart docker daemon - needed after firewalld stop
-systemctl restart docker
+# make sure jenkins is part of the docker only if jenkins has already been
+# created
+grep -q jenkins /etc/passwd
+if [ "$?" == '0' ]
+then
+  /usr/sbin/usermod -a -G docker jenkins
+fi
 
 # vim: sw=2 ts=2 sts=2 et :
-