Merge "Adding installation for Syslog and Netflow"

[releng/builder.git] / jjb / ofextensions / circuitsw / circuitsw.yaml

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index a5cdb4dfba4b1aec763f9d38d6a2f476dde0cde5..776c2c303a78a2d2d275d5a8ef7cc3dce6ce9572 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -19,15 +19,14 @@
     # 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: True
-        - pre-boron:
-            branch: 'pre-boron'
+            disable_autorelease: False
+        - beryllium:
+            branch: 'stable/beryllium'
             jdk: openjdk7
             jdks:
                 - openjdk7
@@ -162,6 +161,7 @@
                 - '{ssh-credentials}'
 
     triggers:
+        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
             name: 'ofextensions/circuitsw'
             branch: '{branch}'
@@ -228,6 +228,7 @@
 
 - job-template:
     name: 'circuitsw-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -420,10 +421,11 @@
 
 - job-template:
     name: 'circuitsw-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -480,6 +482,7 @@
 
 - job-template:
     name: 'circuitsw-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify