X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fvpnservice%2Fvpnservice.yaml;h=903e269657935aab58a6732e727222569cc03df2;hb=eee0a9a1a1ed3590af566a8c14d273c57634364b;hp=1665472fe5aa216d73b33c68997570da3e5a56e6;hpb=f73aa0b876faaa1f435d5a32b83bf1a436f0475d;p=releng%2Fbuilder.git

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index 1665472fe5..903e269657 100644
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
@@ -142,8 +141,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}'
 
@@ -235,6 +234,7 @@
 
 - job-template:
     name: 'vpnservice-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -250,8 +250,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}'
 
@@ -359,10 +359,7 @@
 
 - job-template:
     name: 'vpnservice-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
     #
@@ -430,10 +427,11 @@
 
 - job-template:
     name: 'vpnservice-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -490,6 +488,7 @@
 
 - job-template:
     name: 'vpnservice-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify