Merge "Update CentOS7 images for change 56476"

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

diff --git a/jenkins-scripts/ubuntu-docker-ovs.sh b/jenkins-scripts/ubuntu-docker-ovs.sh
index 4c579478e97e0029e994ee97ee153e3d90e515f8..b4e0207e4566f91830e52d9b9d60f574cb41b294 100755 (executable)
--- a/jenkins-scripts/ubuntu-docker-ovs.sh
+++ b/jenkins-scripts/ubuntu-docker-ovs.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# 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
+
 # Do the final install of OVS that the has to be done at boot time for
 # some reason due to how the snapshots keep behaving.
 dpkg --install /root/openvswitch-datapath-dkms* && \
@@ -11,16 +17,4 @@ dpkg --install /root/openvswitch-{common,switch}*
 # pull docker images
 docker pull alagalah/odlpoc_ovs230
 
-
-# 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: /usr/bin/ovs-vsctl
-jenkins     ALL=NOPASSWD: /usr/bin/ovs-ofctl
-jenkins     ALL=NOPASSWD: /usr/bin/ovs-dpctl
-jenkins     ALL=NOPASSWD: /sbin/ip
-jenkins     ALL=NOPASSWD: /var/run/netns
-EOF
-
 # vim: sw=2 ts=2 sts=2 et :
-