X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ftopoprocessing%2Ftopoprocessing.yaml;h=0bd6ccecbc3566c790efaa5a688f4f09d32a282a;hb=d16da648b854c8b2f13af583aaf109eba0ac6798;hp=a85481ca042b9af24d951ef125d9a92a557299c7;hpb=527f377ce7cd0566eb8f90e0ffddbbecacb8b690;p=releng%2Fbuilder.git

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index a85481ca0..0bd6ccecb 100644
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -8,7 +8,7 @@
     jobs:
         - 'topoprocessing-verify-{stream}'
         - 'topoprocessing-merge-{stream}'
-        - 'topoprocessing-daily-{stream}'
+        - 'topoprocessing-periodic-{stream}'
         - 'topoprocessing-distribution-{stream}'
         - 'topoprocessing-integration-{stream}'
         - 'topoprocessing-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
@@ -143,8 +142,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}'
 
@@ -169,6 +168,7 @@
                 - '{ssh-credentials}'
 
     triggers:
+        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
             name: 'topoprocessing'
             branch: '{branch}'
@@ -223,6 +223,8 @@
         - findbugs
 
     publishers:
+        - archive-artifacts:
+            artifacts: '**/target/surefire-reports/*-output.txt, '
         - email-notification:
             email-prefix: '[topoprocessing]'
         - maven-deploy:
@@ -232,12 +234,13 @@
         - jacoco-report
 
 - job-template:
-    name: 'topoprocessing-daily-{stream}'
+    name: 'topoprocessing-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)
@@ -248,8 +251,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}'
 
@@ -270,7 +273,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * 7'
+        - timed: '@daily'
 
     prebuilders:
         - wipe-org-opendaylight-repo
@@ -425,10 +428,11 @@
 
 - job-template:
     name: 'topoprocessing-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -485,6 +489,7 @@
 
 - job-template:
     name: 'topoprocessing-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -530,6 +535,7 @@
         global-settings: '{odl-global-settings}'
 
     postbuilders:
+        - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
         - check-clm:
             application-name: topoprocessing