X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=2575a3a84a7d318ff971eb5ef6cb9f57cc7a3704;hb=187770b9d3918a4d9a5528c29780af96e2ce5b74;hp=37905f67c3e05b4f7ba72223988ff82b318d2bbd;hpb=08c409cd288c13f6796d88e537c76a2b529a764b;p=releng%2Fbuilder.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 37905f67c..2575a3a84 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -76,7 +76,8 @@
       - string:
           name: PATCHES_TO_BUILD
           default: ''
-          description: 'csv list of patches in project:changeset format to build distribution with'
+          description: |
+            Patches to add to distro in CSV project:changeset format (genius:32/53632/9,netvirt:59/50259/47)
 
 - parameter:
     name: run-test-parameter
@@ -466,6 +467,8 @@
       - mask-passwords
       - config-file-provider:
           files:
+            - file-id: npmrc
+              target: '$HOME/.npmrc'
             - file-id: rackspace-heat
               target: '$HOME/.config/openstack/clouds.yaml'
       - timeout:
@@ -522,6 +525,7 @@
           export PACKER_LOG_PATH="packer-build.log" && \
                       packer.io build -color=false -var-file=$CLOUDENV \
                        -var-file=../packer/vars/{platform}.json \
+                       -parallel=false \
                        ../packer/templates/{template}.json
 
 - builder:
@@ -562,14 +566,12 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: '{pom}'
-          goals: >
+          goals: |
               clean deploy dependency:tree
               -DoutputFile=dependency_tree.txt
-              -V -B -Pq
-              -Djenkins
+              -Pq
               -DaltDeploymentRepository=fake-nexus::default::file:///tmp/n/
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              {mvn-opts}
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: 'integration-settings'
@@ -604,13 +606,11 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: '{dist-pom}'
-          goals: >
+          goals: |
               clean install dependency:tree
               -DoutputFile=dependency_tree.txt
-              -V -B -Pq
-              -Djenkins
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              -Pq
+              {mvn-opts}
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
           settings: 'integration-settings'
@@ -706,13 +706,11 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: '{dist-pom}'
-          goals: >
+          goals: |
               clean install dependency:tree
               -DoutputFile=dependency_tree.txt -s fake_remotes.xml
-              -V -B -Pq
+              -Pq
               -DskipTests=false
-              -Djenkins
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              {mvn-opts}
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'