Merge "Adding installation for Syslog and Netflow"

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

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index f0fe90277c0d8e085fa158effd45f8c1f7f72da7..5d64f1302cba9b734beb8536f61c6caed47ff392 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -19,20 +19,20 @@
     # 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
                 - 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
@@ -241,6 +241,7 @@
 
 - job-template:
     name: 'snmp4sdn-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -433,10 +434,11 @@
 
 - job-template:
     name: 'snmp4sdn-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -493,6 +495,7 @@
 
 - job-template:
     name: 'snmp4sdn-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify