Merge "Adding installation for Syslog and Netflow"

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

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 341fde4c7dbf3e1fc0601a6664efdf31a5286a26..198d8a31a0a7d1b7b6c4a9517f1faaa0bc85b5ca 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -19,27 +19,26 @@
     # 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
                 - openjdk8
-            disable_autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
@@ -242,6 +241,7 @@
 
 - job-template:
     name: 'lispflowmapping-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -434,10 +434,11 @@
 
 - job-template:
     name: 'lispflowmapping-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -494,6 +495,7 @@
 
 - job-template:
     name: 'lispflowmapping-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify