Merge "Tell netconf-ready in clustering job to not use netconf connector"

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

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 7f612e3e2fda4770c01f362a30110d8be8709fa6..d3544de77168d9647b4fbc87b5b5de9e1e173ab5 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -19,26 +19,25 @@
     # 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
             jdks:
                 - openjdk7
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
@@ -241,6 +240,7 @@
 
 - job-template:
     name: 'vtn-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,6 +433,7 @@
 
 - job-template:
     name: 'vtn-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -493,6 +494,7 @@
 
 - job-template:
     name: 'vtn-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify