Merge "Adding installation for Syslog and Netflow"

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

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 6a026017b2dfc7262bd0ee889081d60a38294233..5b2aa95a799c0da08ea0b570f68836247837192a 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.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
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
@@ -174,6 +173,7 @@
                 - '{ssh-credentials}'
 
     triggers:
+        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
             name: 'aaa'
             branch: '{branch}'
@@ -240,6 +240,7 @@
 
 - job-template:
     name: 'aaa-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -432,10 +433,11 @@
 
 - job-template:
     name: 'aaa-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -492,6 +494,7 @@
 
 - job-template:
     name: 'aaa-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify