X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdiscovery%2Fdiscovery.yaml;h=7189780d4e07d736341ff12122142c3190eb20ae;hb=a1ee1a1a44975646f8dc08c419eca81f8ffdff56;hp=e6aab1e6c9e2c5191c15792745a488b8cbfc140b;hpb=f1c447d2e43c59a2587e83d288b1d35741b16a2f;p=releng%2Fbuilder.git

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index e6aab1e6c..7189780d4 100644
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -8,7 +8,7 @@
     jobs:
         - 'discovery-verify-{stream}'
         - 'discovery-merge-{stream}'
-        - 'discovery-daily-{stream}'
+        - 'discovery-periodic-{stream}'
         - 'discovery-distribution-{stream}'
         - 'discovery-integration-{stream}'
         - 'discovery-sonar'
@@ -19,12 +19,18 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
             disable_autorelease: True
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+            disable_autorelease: True
 
     project: 'discovery'
 
@@ -128,8 +134,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}'
 
@@ -154,6 +160,7 @@
                 - '{ssh-credentials}'
 
     triggers:
+        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
             name: 'discovery'
             branch: '{branch}'
@@ -208,6 +215,8 @@
         - findbugs
 
     publishers:
+        - archive-artifacts:
+            artifacts: '**/target/surefire-reports/*-output.txt, '
         - email-notification:
             email-prefix: '[discovery]'
         - maven-deploy:
@@ -217,12 +226,13 @@
         - jacoco-report
 
 - job-template:
-    name: 'discovery-daily-{stream}'
+    name: 'discovery-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)
@@ -233,8 +243,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}'
 
@@ -255,7 +265,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * 7'
+        - timed: '@daily'
 
     prebuilders:
         - wipe-org-opendaylight-repo
@@ -410,10 +420,11 @@
 
 - job-template:
     name: 'discovery-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -470,6 +481,7 @@
 
 - job-template:
     name: 'discovery-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -509,12 +521,13 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{discovery-settings}'
         global-settings: '{odl-global-settings}'
 
     postbuilders:
+        - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
         - check-clm:
             application-name: discovery