Merge "Ovsdb clustering csit job feature update."

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

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 628038f62eaa8959314b4cd7943bcd8736020297..815dc975ad976d4b2ad6322bc642ef752ffbb178 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -8,7 +8,7 @@
     jobs:
         - 'ovsdb-verify-{stream}'
         - 'ovsdb-merge-{stream}'
-        - 'ovsdb-daily-{stream}'
+        - 'ovsdb-periodic-{stream}'
         - 'ovsdb-distribution-{stream}'
         - 'ovsdb-integration-{stream}'
         - 'ovsdb-clm-{stream}'
@@ -25,18 +25,6 @@
                 - openjdk7
                 - openjdk8
             disable_autorelease: False
-        - clustering-netvirt-master:
-            branch: 'topic/master/net-virt-clustering'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-            disable_autorelease: True
-        - routermanager:
-            branch: 'topic/routermanager'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-            disable_autorelease: True
         - pre-boron:
             branch: 'pre-boron'
             jdk: openjdk7
@@ -239,6 +227,8 @@
         - findbugs
 
     publishers:
+        - archive-artifacts:
+            artifacts: '**/target/surefire-reports/*-output.txt, '
         - email-notification:
             email-prefix: '[ovsdb]'
         - maven-deploy:
@@ -248,12 +238,12 @@
         - jacoco-report
 
 - job-template:
-    name: 'ovsdb-daily-{stream}'
+    name: 'ovsdb-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)
@@ -286,7 +276,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * 7'
+        - timed: '@daily'
 
     prebuilders:
         - wipe-org-opendaylight-repo
@@ -480,12 +470,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: '{ovsdb-settings}'
         global-settings: '{odl-global-settings}'
 
     postbuilders:
+        - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
         - check-clm:
             application-name: ovsdb