Added OpenFlowJava integration job configuration

- integration job was missing

Change-Id: I91b95227bcd86714d477ab061eb3dc2f043c59da
Signed-off-by: Martin Uhlir <martin.uhlir@pantheon.sk>

diff --git a/jjb/openflowjava/openflowjava.cfg b/jjb/openflowjava/openflowjava.cfg
new file mode 100644 (file)
index 0000000..634aa69
--- /dev/null
+++ b/jjb/openflowjava/openflowjava.cfg
@@ -0,0 +1 @@
+DEPENDENCIES: yangtools,controller
\ No newline at end of file

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index 353721bf989daf89b3bc19b5636b0a7c344ac07f..3977589a3d35bfcea17213ff3a2dc019d1f86bfd 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -197,7 +197,7 @@
 
 - job-template:
     name: 'openflowjava-integration-{stream}'
-    disabled: true
+    disabled: false
 
     # Job template for ODL merge jobs
     #
@@ -235,7 +235,7 @@
 
     triggers:
         - reverse:
-            jobs: ''
+            jobs: 'yangtools-merge-{stream},controller-merge-{stream}'
             result: 'success'
 
     maven:
@@ -298,4 +298,4 @@
             language: 'java'
             maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
         - email-notification:
-            email-prefix: '[openflowjava]'
+            email-prefix: '[openflowjava] [yangtools] [controller]'