Merge "BUG-2625: validate tsdr using jdk8 only"

[releng/builder.git] / jjb / of-config / of-config.yaml

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 5fcd0dd11edcd2d61d7d2603f328f30e4dc2cf64..bbf7c065d327435889e3333851602f968a5f9e82 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -19,20 +19,20 @@
     # 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
                 - 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: 'of-config'
 
@@ -162,6 +162,7 @@
                 - '{ssh-credentials}'
 
     triggers:
+        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
             name: 'of-config'
             branch: '{branch}'
@@ -216,6 +217,8 @@
         - findbugs
 
     publishers:
+        - archive-artifacts:
+            artifacts: '**/target/surefire-reports/*-output.txt, '
         - email-notification:
             email-prefix: '[of-config]'
         - maven-deploy:
@@ -226,6 +229,7 @@
 
 - job-template:
     name: 'of-config-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -418,6 +422,7 @@
 
 - job-template:
     name: 'of-config-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -478,6 +483,7 @@
 
 - job-template:
     name: 'of-config-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -517,12 +523,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: '{of-config-settings}'
         global-settings: '{odl-global-settings}'
 
     postbuilders:
+        - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
         - check-clm:
             application-name: of-config