X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=2575a3a84a7d318ff971eb5ef6cb9f57cc7a3704;hb=144623a4ffd48ac6f459e158fbaf4cc73c3a3be2;hp=5be34b1f2bb2441e2ce5eb8e300e421ca77fc2be;hpb=d2485d78d895d07ce28daf8795cef228d8cdff55;p=releng%2Fbuilder.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 5be34b1f2..2575a3a84 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -6,8 +6,11 @@
       - build-discarder:
           days-to-keep: '{build-days-to-keep}'
           num-to-keep: 40
-          artifact-days-to-keep: -1
-          artifact-num-to-keep: 5
+          # Need to keep artifacts for at least 1 day as some projects need to
+          # be able to validate their artifacts and only allowing limited
+          # number of artifacts could make fast moving jobs lost their
+          # artifacts before the developers can test it.
+          artifact-days-to-keep: 1
 
 - parameter:
     name: opendaylight-infra-parameters
@@ -39,8 +42,17 @@
           description: "GERRIT_REFSPEC parameter if not given by trigger"
       - string:
           name: STACK_NAME
-          default: '$JOB_NAME-$BUILD_NUMBER'
+          default: '$SILO-$JOB_NAME-$BUILD_NUMBER'
           description: "Used by Heat to generate a unique stack & vm name"
+      - string:
+          name: OS_CLOUD
+          default: '{os-cloud}'
+          description: |
+              The name of a cloud configuration in clouds.yaml. OS_CLOUD is a
+              variable name that is significant to openstack client as a
+              environment variable. Please refer to the documentation for
+              further details.
+              https://docs.openstack.org/developer/python-openstackclient/
 
 - parameter:
     name: build-tag
@@ -64,7 +76,16 @@
       - 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
+    parameters:
+      - string:
+          name: RUNTEST
+          default: '{run-test}'
+          description: 'Set true to run test after build'
 
 - parameter:
     name: distribution-branch-to-build-parameter
@@ -446,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:
@@ -502,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:
@@ -542,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'
@@ -584,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'
@@ -686,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'