Merge "BUG-2625: enable JDK8 verification for snbi"

diff --git a/jenkins-scripts/ubuntu-docker-ovs.sh b/jenkins-scripts/ubuntu-docker-ovs.sh
index 09479919e53b0838fcabe8ad856436f78609c978..4c579478e97e0029e994ee97ee153e3d90e515f8 100755 (executable)
--- a/jenkins-scripts/ubuntu-docker-ovs.sh
+++ b/jenkins-scripts/ubuntu-docker-ovs.sh
@@ -11,5 +11,16 @@ 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 :
 

diff --git a/jjb/armoury/armoury.cfg b/jjb/armoury/armoury.cfg
index 0fe575d55eaecd141618beadb131b5c57eabf247..48772afcc0171837e9b3082e55958b1b41f44fb0 100644 (file)
--- a/jjb/armoury/armoury.cfg
+++ b/jjb/armoury/armoury.cfg
@@ -1,6 +1,6 @@
 STREAMS:
 - beryllium:
     branch: master
-    jdks: openjdk7
+    jdks: openjdk7,openjdk8
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
 DEPENDENCIES: odlparent,yangtools,controller,mdsal