Merge "Activate JDK8 for aaa project"

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

diff --git a/jjb/netide/netide.cfg b/jjb/netide/netide.cfg
index 74abfeb8e457c84e3fe44caa10404e2490207287..cddb697b9398093fab469c6bef040155f6824170 100644 (file)
--- a/jjb/netide/netide.cfg
+++ b/jjb/netide/netide.cfg
@@ -1,6 +1,6 @@
 STREAMS:\r
 - beryllium:\r
     branch: master\r
-    jdks: openjdk7\r
+    jdks: openjdk7,openjdk8\r
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m\r
 DEPENDENCIES: odlparent,yangtools,controller,openflowjava\r

diff --git a/jjb/next/next.cfg b/jjb/next/next.cfg
index e887a22958bd7330afe7145d215a7daff7195fed..52a70e0184be17800ed012b165e0ec98a86a3e5a 100644 (file)
--- a/jjb/next/next.cfg
+++ b/jjb/next/next.cfg
@@ -1,5 +1,5 @@
 STREAMS:
 - beryllium:
     branch: master
-    jdks: openjdk7
-DEPENDENCIES: odlparent,controller,yangtools
\ No newline at end of file
+    jdks: openjdk7,openjdk8
+DEPENDENCIES: odlparent,controller,yangtools

diff --git a/jjb/snbi/snbi.cfg b/jjb/snbi/snbi.cfg
index ce56cd201f0fca48419975acb13d38af5817c762..fb1e37caf2cdd9bed100adfd3e110678c800d16f 100644 (file)
--- a/jjb/snbi/snbi.cfg
+++ b/jjb/snbi/snbi.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - beryllium:
     branch: master
-    jdks: openjdk7
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7

diff --git a/jjb/tsdr/tsdr.cfg b/jjb/tsdr/tsdr.cfg
index ae042dad93f956cb968e5e3f51cf9c245d29efde..6858a4626d0aeec852dec05835b808e0e9f02e02 100644 (file)
--- a/jjb/tsdr/tsdr.cfg
+++ b/jjb/tsdr/tsdr.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - beryllium:
     branch: master
-    jdks: openjdk7
+    jdks: openjdk7,openjdk8
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7