X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyangtools%2Fyangtools.yaml;h=9bb6764390d61957920432dfc93f440473730686;hb=refs%2Fchanges%2F13%2F33913%2F1;hp=b6a7fa7249241d60ac986a77eb34dee82a4836d3;hpb=f1c447d2e43c59a2587e83d288b1d35741b16a2f;p=releng%2Fbuilder.git

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index b6a7fa724..9bb676439 100644
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -7,7 +7,7 @@
     name: yangtools
     jobs:
         - 'yangtools-merge-{stream}'
-        - 'yangtools-daily-{stream}'
+        - 'yangtools-periodic-{stream}'
         - 'yangtools-distribution-{stream}'
         - 'yangtools-integration-{stream}'
         - 'yangtools-sonar'
@@ -18,20 +18,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
@@ -97,6 +96,7 @@
                 - '{ssh-credentials}'
 
     triggers:
+        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
             name: 'yangtools'
             branch: '{branch}'
@@ -151,6 +151,8 @@
         - findbugs
 
     publishers:
+        - archive-artifacts:
+            artifacts: '**/target/surefire-reports/*-output.txt, '
         - email-notification:
             email-prefix: '[yangtools]'
         - maven-deploy:
@@ -160,12 +162,13 @@
         - jacoco-report
 
 - job-template:
-    name: 'yangtools-daily-{stream}'
+    name: 'yangtools-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)
@@ -198,7 +201,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * 7'
+        - timed: '@daily'
 
     prebuilders:
         - wipe-org-opendaylight-repo
@@ -353,10 +356,11 @@
 
 - job-template:
     name: 'yangtools-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -413,6 +417,7 @@
 
 - job-template:
     name: 'yangtools-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -452,12 +457,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: '{yangtools-settings}'
         global-settings: '{odl-global-settings}'
 
     postbuilders:
+        - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
         - check-clm:
             application-name: yangtools