Merge "Enable VTN Coordinator CSIT for Boron"

[releng/builder.git] / jjb-templates / distribution-check.yaml

diff --git a/jjb-templates/distribution-check.yaml b/jjb-templates/distribution-check.yaml
index 068d73a982413e6fb0d5c49afa2eb2a77fc7ec68..1d73a75fff69cc406e902475365c40c24ac1c89e 100644 (file)
--- a/jjb-templates/distribution-check.yaml
+++ b/jjb-templates/distribution-check.yaml
@@ -19,10 +19,10 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - gerrit-project-parameter:
+        - gerrit-parameters:
             project: '{project}'
-        - gerrit-refspec-parameter:
-            refspec: '{branch}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
         - project-parameter:
             project: '{project}'
         - integration-distribution-git-url
@@ -75,7 +75,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'
-            goals: 'clean install -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+            goals: 'clean install -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
             java-opts:
                 - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
             settings: '{JENKINS_SETTINGS}'
@@ -84,8 +84,8 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'distribution/pom.xml'
-        goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-B -Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        goals: 'clean install -B -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: '{JENKINS_SETTINGS}'
         global-settings: '{odl-global-settings}'
         ignore-upstream-changes: true