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

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

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index df2bad23e10176f79206614553e768696a11cfd4..18c3a43311561657c9850504147a03a54d597228 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -19,18 +19,18 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
             jdk: openjdk8
             jdks:
                 - openjdk8
             disable_autorelease: False
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'stable/beryllium'
             jdk: openjdk8
             jdks:
                 - openjdk8
-            disable_autorelease: True
+            disable_autorelease: False
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
@@ -167,6 +167,7 @@
                 - '{ssh-credentials}'
 
     triggers:
+        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
             name: 'neutron'
             branch: '{branch}'
@@ -233,6 +234,7 @@
 
 - job-template:
     name: 'neutron-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -425,6 +427,7 @@
 
 - job-template:
     name: 'neutron-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -485,6 +488,7 @@
 
 - job-template:
     name: 'neutron-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify