X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Farmoury%2Farmoury.yaml;h=388f205b80ccb75ee1b711644ae9b1d256ca63c7;hb=a1ee1a1a44975646f8dc08c419eca81f8ffdff56;hp=8fa1502054f28eb3686da3973eea5aef93c62584;hpb=f73aa0b876faaa1f435d5a32b83bf1a436f0475d;p=releng%2Fbuilder.git

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 8fa150205..388f205b8 100644
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -136,8 +136,8 @@
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
@@ -229,6 +229,7 @@
 
 - job-template:
     name: 'armoury-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -244,8 +245,8 @@
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
@@ -353,10 +354,7 @@
 
 - job-template:
     name: 'armoury-integration-{stream}'
-    # Temporarily disable this job until Rackspace networking issues are
-    # resolved.
-    #disabled: DISABLED
-    disabled: true
+    disabled: false
 
     # Job template for ODL integration verify jobs
     #
@@ -424,10 +422,11 @@
 
 - job-template:
     name: 'armoury-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -484,6 +483,7 @@
 
 - job-template:
     name: 'armoury-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify