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
old mode 100644 (file)
new mode 100755 (executable)
index 4b442d9..b4e0207
--- a/jenkins-scripts/ubuntu-docker-ovs.sh
+++ b/jenkins-scripts/ubuntu-docker-ovs.sh
@@ -1,5 +1,16 @@
 #!/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* && \
+dpkg --install /root/openvswitch-{common,switch}*
+
 # add user jenkins to docker group
 /usr/sbin/usermod -a -G docker jenkins
 
@@ -7,4 +18,3 @@
 docker pull alagalah/odlpoc_ovs230
 
 # vim: sw=2 ts=2 sts=2 et :
-