Merge "Adding installation for Syslog and Netflow"

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

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 49c78c0efd017ea7057238750a19129f5063ff23..701eb35c5e34730703c97b91114f5be2b3cf0ad6 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.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: True
-        - pre-boron:
-            branch: 'pre-boron'
+            disable_autorelease: False
+        - beryllium:
+            branch: 'beryllium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
+            disable_autorelease: False
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
@@ -235,6 +234,7 @@
 
 - job-template:
     name: 'capwap-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -427,10 +427,11 @@
 
 - job-template:
     name: 'capwap-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -487,6 +488,7 @@
 
 - job-template:
     name: 'capwap-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify