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

diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml
index c0ab49b5d..903e26965 100644
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -8,7 +8,7 @@
     jobs:
         - 'vpnservice-verify-{stream}'
         - 'vpnservice-merge-{stream}'
-        - 'vpnservice-daily-{stream}'
+        - 'vpnservice-periodic-{stream}'
         - 'vpnservice-distribution-{stream}'
         - 'vpnservice-integration-{stream}'
         - 'vpnservice-sonar'
@@ -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
@@ -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}'
 
@@ -168,6 +167,7 @@
                 - '{ssh-credentials}'
 
     triggers:
+        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
             name: 'vpnservice'
             branch: '{branch}'
@@ -222,6 +222,8 @@
         - findbugs
 
     publishers:
+        - archive-artifacts:
+            artifacts: '**/target/surefire-reports/*-output.txt, '
         - email-notification:
             email-prefix: '[vpnservice]'
         - maven-deploy:
@@ -231,12 +233,13 @@
         - jacoco-report
 
 - job-template:
-    name: 'vpnservice-daily-{stream}'
+    name: 'vpnservice-periodic-{stream}'
+    disabled: false
 
-    # Job template for daily builders
+    # Job template for periodic builders
     #
-    # The purpose of this job template is to setup a daily/nightly
-    # builder and pushes to Sonar analysis.
+    # The purpose of this job template is to setup a periodic
+    # builder.
     #
     # Required Variables:
     #     stream:    release stream (eg. stable-lithium or beryllium)
@@ -247,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}'
 
@@ -269,7 +272,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * 7'
+        - timed: '@daily'
 
     prebuilders:
         - wipe-org-opendaylight-repo
@@ -424,10 +427,11 @@
 
 - job-template:
     name: 'vpnservice-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -484,6 +488,7 @@
 
 - job-template:
     name: 'vpnservice-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -529,6 +534,7 @@
         global-settings: '{odl-global-settings}'
 
     postbuilders:
+        - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
         - check-clm:
             application-name: vpnservice