Merge "Adding installation for Syslog and Netflow"

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

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
index ec247f406678b22a8a0c63671c5a0aeac4670803..8bb8868376c16b17acc2e9cf90efe575b5e4d2e4 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -19,18 +19,24 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
             disable_autorelease: True
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+            disable_autorelease: True
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            disable_autorelease: False
+            disable_autorelease: True
 
     project: 'coretutorials'
 
@@ -227,6 +233,7 @@
 
 - job-template:
     name: 'coretutorials-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -419,10 +426,11 @@
 
 - job-template:
     name: 'coretutorials-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -479,6 +487,7 @@
 
 - job-template:
     name: 'coretutorials-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify