Merge "Added neutron, sfc, and ovsdb dependencies to gbp jjb."

diff --git a/jenkins-scripts/docker.sh b/jenkins-scripts/docker.sh
index 643b534f5a07135d8a271da8f845ab98e94b9c60..38633a891f15977763a368e4f35bcc1e4ab7e7e4 100755 (executable)
--- a/jenkins-scripts/docker.sh
+++ b/jenkins-scripts/docker.sh
@@ -2,5 +2,8 @@
 
 /usr/sbin/usermod -a -G docker jenkins
 
+# stop firewall
+systemctl stop firewalld
+
 # vim: sw=2 ts=2 sts=2 et :
 

diff --git a/jjb/vpnservice/vpnservice.cfg b/jjb/vpnservice/vpnservice.cfg
index ac61ca99a9665d60ddc106a5a7d837d2e98d6a06..d721ec0bfbf854a2211390091e707acc996e0862 100644 (file)
--- a/jjb/vpnservice/vpnservice.cfg
+++ b/jjb/vpnservice/vpnservice.cfg
@@ -5,4 +5,4 @@ STREAMS:
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
-DEPENDENCIES: controller,yangtools,odlparent,openflowplugin
+DEPENDENCIES: controller,yangtools,odlparent,openflowplugin,neutron

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index c4e9a2bf75575c499c2350a3689901ebd336261e..d6e000ac68cf755110e48a3d06e0ec005f91b022 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -348,7 +348,7 @@
 
     triggers:
         - reverse:
-            jobs: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},openflowplugin-merge-{stream}'
+            jobs: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream}'
             result: 'success'
 
     prebuilders:
@@ -371,7 +371,7 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[vpnservice] [controller] [yangtools] [odlparent] [openflowplugin]'
+            email-prefix: '[vpnservice] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
         - jacoco-report
 
 - job-template: