From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Mon, 2 Nov 2015 15:40:08 +0000 (+0000)
Subject: Merge "Activate JDK8 for aaa project"
X-Git-Tag: release/beryllium~422
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=166bc33b1664beb7e3f422948cea24dacc8de1a1;hp=85747121dffedf306d2520168bb94ac0fb86e8d6;p=releng%2Fbuilder.git

Merge "Activate JDK8 for aaa project"
---

diff --git a/jenkins-scripts/ubuntu-docker-ovs.sh b/jenkins-scripts/ubuntu-docker-ovs.sh
index 09479919e5..4c579478e9 100755
--- 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 0fe575d55e..48772afcc0 100644
--- 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 74abfeb8e4..cddb697b93 100644
--- a/jjb/netide/netide.cfg
+++ b/jjb/netide/netide.cfg
@@ -1,6 +1,6 @@
 STREAMS:
 - beryllium:
     branch: master
-    jdks: openjdk7
+    jdks: openjdk7,openjdk8
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
 DEPENDENCIES: odlparent,yangtools,controller,openflowjava
diff --git a/jjb/next/next.cfg b/jjb/next/next.cfg
index e887a22958..52a70e0184 100644
--- 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 ce56cd201f..fb1e37caf2 100644
--- 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 ae042dad93..6858a4626d 100644
--- 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