Add dependencies to openflowplugin jobs

Change-Id: I4ea13b19a9e9cc50cc9f7dcbd86eac0465dc8c07
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/jjb/openflowplugin/openflowplugin.cfg b/jjb/openflowplugin/openflowplugin.cfg
index 7898fb5da174a69d564bde1fa4b89bb93f4d29a3..1fc78639aa6c023b15b40fcb13d20bb7094bbc63 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.cfg
+++ b/jjb/openflowplugin/openflowplugin.cfg
@@ -1,2 +1,3 @@
 MVN_GOALS: -Dmaven.repo.local=$WORKSPACE/.m2repo -Dorg.ops4j.pax.url.mvn.localRepository=$WORKSPACE/.m2repo clean install javadoc:aggregate
 #MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m
+DEPENDENCIES: yangtools,controller,openflowjava

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 051ba31e30fbfa18f0cfddf8f5eac527a9397c2e..8867c676327483221be3688025bc74e7680216de 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -196,7 +196,7 @@
 
 - job-template:
     name: 'openflowplugin-integration-{stream}'
-    disabled: true
+    disabled: false
 
     # Job template for ODL merge jobs
     #
@@ -233,7 +233,7 @@
 
     triggers:
         - reverse:
-            jobs: ''
+            jobs: 'yangtools-merge,controller-merge,openflowjava-merge'
             result: 'success'
 
     maven:
@@ -246,4 +246,4 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[openflowplugin]'
+            email-prefix: '[openflowplugin] [yangtools] [controller] [openflowjava]'