Merge "BUG-2625: validate yang-push using jdk8 only"

[releng/builder.git] / jjb / mdsal / mdsal.yaml

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 5757bb7b3a82d9eb7872d21cd3eed14aa1b1a401..7fb888199a643ea26ad56c2f9c92b1e2844663fb 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -8,7 +8,7 @@
     jobs:
         - 'mdsal-verify-{stream}'
         - 'mdsal-merge-{stream}'
-        - 'mdsal-daily-{stream}'
+        - 'mdsal-periodic-{stream}'
         - 'mdsal-distribution-{stream}'
         - 'mdsal-integration-{stream}'
         - 'mdsal-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
 
     project: 'mdsal'
 
@@ -162,6 +161,7 @@
                 - '{ssh-credentials}'
 
     triggers:
+        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
             name: 'mdsal'
             branch: '{branch}'
@@ -216,6 +216,8 @@
         - findbugs
 
     publishers:
+        - archive-artifacts:
+            artifacts: '**/target/surefire-reports/*-output.txt, '
         - email-notification:
             email-prefix: '[mdsal]'
         - maven-deploy:
@@ -225,12 +227,12 @@
         - jacoco-report
 
 - job-template:
-    name: 'mdsal-daily-{stream}'
+    name: 'mdsal-periodic-{stream}'
 
-    # 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)
@@ -263,7 +265,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * 7'
+        - timed: '@daily'
 
     prebuilders:
         - wipe-org-opendaylight-repo
@@ -523,6 +525,7 @@
         global-settings: '{odl-global-settings}'
 
     postbuilders:
+        - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
         - check-clm:
             application-name: mdsal