X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fvtn%2Fvtn.yaml;h=8cce8c486b16a2667308c5569109e55e27cd7ae6;hb=bc254cc10bd95cb176b303d4c25b339220b15806;hp=07d5cd2023449213b40c0a8d9a1add8730b1f53b;hpb=379f65ff707cc6bacff395e3566f1ccac1f78c54;p=releng%2Fbuilder.git

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 07d5cd202..8cce8c486 100644
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -12,7 +12,7 @@
         - 'vtn-distribution-{stream}'
         - 'vtn-integration-{stream}'
         - 'vtn-sonar'
-        - 'vtn-clm'
+        - 'vtn-clm-{stream}'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -97,15 +97,15 @@
 
     builders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
         - maven-target:
-            maven-version: '{mvn32}'
+            maven-version: '{mvn33}'
             pom: 'pom.xml'
             goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
                 - '-Xmx1024m -XX:MaxPermSize=256m'
             settings: '{vtn-settings}'
             global-settings: '{odl-global-settings}'
-        - jacoco-nojava-workaround
 
     publishers:
         - findbugs
@@ -158,18 +158,16 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar -Dmerge'
+        goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{vtn-settings}'
         global-settings: '{odl-global-settings}'
 
-    postbuilders:
-        - jacoco-nojava-workaround
-
     reporters:
         - findbugs
 
@@ -227,18 +225,16 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
+        goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{vtn-settings}'
         global-settings: '{odl-global-settings}'
 
-    postbuilders:
-        - jacoco-nojava-workaround
-
     reporters:
         - findbugs
 
@@ -285,9 +281,9 @@
         - wipe-org-opendaylight-repo
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
         settings: '{integration-settings}'
         global-settings: '{odl-global-settings}'
@@ -347,18 +343,16 @@
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
+        goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{vtn-settings}'
         global-settings: '{odl-global-settings}'
 
-    postbuilders:
-        - jacoco-nojava-workaround
-
     reporters:
         - findbugs
 
@@ -398,18 +392,21 @@
 
     triggers:
         - timed: 'H H * * *'
+        - gerrit-trigger-patch-sonar:
+            name: 'vtn'
+
+    prebuilders:
+        - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dsonar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: '{vtn-settings}'
         global-settings: '{odl-global-settings}'
 
-    postbuilders:
-        - jacoco-nojava-workaround
-
     reporters:
         - findbugs
 
@@ -422,11 +419,11 @@
         - jacoco-report
 
 - job-template:
-    name: 'vtn-clm'
+    name: 'vtn-clm-{stream}'
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: '{jdk}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -442,7 +439,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: '{branch}'
 
     wrappers:
         - build-timeout
@@ -457,7 +454,7 @@
         - wipe-org-opendaylight-repo
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         goals: 'com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'