Merge "BUG-2625: validate vpnservice using jdk8 only"

[releng/builder.git] / jjb / openflowjava / openflowjava.yaml

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index 043d6c0b79a11e8c423ea46989ac352c32d09ae9..9e22c837f1954f3bbba4e9035c7ef1631a0784cf 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -19,20 +19,19 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'stable/beryllium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
+            disable_autorelease: False
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
@@ -242,6 +241,7 @@
 
 - job-template:
     name: 'openflowjava-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -434,6 +434,7 @@
 
 - job-template:
     name: 'openflowjava-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -494,6 +495,7 @@
 
 - job-template:
     name: 'openflowjava-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify