X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdefense4all%2Fdefense4all.yaml;h=18670b93df110cc920ff409c0091e1e9f2a32aa4;hb=6eac1e0a453621540506f9b7d064a092632f8390;hp=88f19f8acaab2113705647241b03c8d09eea81e3;hpb=2ca3b6da8746c3ec02afedc87e90e520d1d14e36;p=releng%2Fbuilder.git

diff --git a/jjb/defense4all/defense4all.yaml b/jjb/defense4all/defense4all.yaml
index 88f19f8ac..18670b93d 100644
--- a/jjb/defense4all/defense4all.yaml
+++ b/jjb/defense4all/defense4all.yaml
@@ -8,7 +8,7 @@
     jobs:
         - 'defense4all-verify-{stream}'
         - 'defense4all-merge-{stream}'
-        - 'defense4all-daily-{stream}'
+        - 'defense4all-periodic-{stream}'
         - 'defense4all-distribution-{stream}'
         - 'defense4all-integration-{stream}'
         - 'defense4all-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
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
@@ -111,7 +117,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'dfapp/pom.xml'
-            goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dstream={stream}'
+            goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Djenkins -Dstream={stream}'
             java-opts:
                 - '-Xmx1024m -XX:MaxPermSize=256m'
             settings: '{defense4all-settings}'
@@ -166,6 +172,7 @@
                 - '{ssh-credentials}'
 
     triggers:
+        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
             name: 'defense4all'
             branch: '{branch}'
@@ -180,7 +187,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'dfapp/pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dstream={stream}'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Djenkins -Dmerge -Dstream={stream}'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{defense4all-settings}'
         global-settings: '{odl-global-settings}'
@@ -220,6 +227,8 @@
         - findbugs
 
     publishers:
+        - archive-artifacts:
+            artifacts: '**/target/surefire-reports/*-output.txt, '
         - email-notification:
             email-prefix: '[defense4all]'
         - maven-deploy:
@@ -229,12 +238,13 @@
         - jacoco-report
 
 - job-template:
-    name: 'defense4all-daily-{stream}'
+    name: 'defense4all-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)
@@ -267,7 +277,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * 7'
+        - timed: '@daily'
 
     prebuilders:
         - wipe-org-opendaylight-repo
@@ -279,7 +289,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'dfapp/pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Djenkins'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{defense4all-settings}'
         global-settings: '{odl-global-settings}'
@@ -339,7 +349,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install'
+        goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
         settings: '{integration-settings}'
         global-settings: '{odl-global-settings}'
@@ -407,7 +417,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'dfapp/pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Djenkins'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{defense4all-settings}'
         global-settings: '{odl-global-settings}'
@@ -422,10 +432,11 @@
 
 - job-template:
     name: 'defense4all-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -464,7 +475,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'dfapp/pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dsonar'
+        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Djenkins -Dsonar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{defense4all-settings}'
         global-settings: '{odl-global-settings}'
@@ -482,6 +493,7 @@
 
 - job-template:
     name: 'defense4all-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -521,12 +533,13 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -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: '{defense4all-settings}'
         global-settings: '{odl-global-settings}'
 
     postbuilders:
+        - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
         - check-clm:
             application-name: defense4all
 
@@ -608,7 +621,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: validate-pom.xml
-            goals: 'clean install -T1.5C -DskipTests -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            goals: 'clean install -T1.5C -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
             - '-Xmx8g'
             settings: '{autorelease-settings}'
@@ -617,7 +630,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean validate -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean validate -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
         settings: '{autorelease-settings}'
         global-settings: '{odl-global-settings}'