Merge "Adding installation for Syslog and Netflow"

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

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 924b0d1a7ec54845c37a8b64593af28f70a1cd76..cafb24120d540d89c2087a69a61e7171d4f966d8 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.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: False
-        - pre-boron:
-            branch: 'pre-boron'
+        - beryllium:
+            branch: 'stable/beryllium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
+            disable_autorelease: False
 
     project: 'netconf'
 
@@ -229,6 +228,7 @@
 
 - job-template:
     name: 'netconf-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -421,10 +421,11 @@
 
 - job-template:
     name: 'netconf-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -481,6 +482,7 @@
 
 - job-template:
     name: 'netconf-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify