X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=eb25459ee0c95d246b1a7748bdc42e7e8ec43167;hb=ec0a666af4481b21b82be836011d6c94bb04e098;hp=d0f596b4045946b05e580bfc424931624ac6b8f1;hpb=10821edc619b09e4623884b02900c39431f8a809;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index d0f596b4..eb25459e 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -76,10 +76,8 @@
     builders:
       - config-file-provider:
           files:
-            - file-id: '{os-cloud-file-id}'
-              target: '$HOME/.config/openstack/clouds.yaml'
-            - file-id: 'packer-cloud-env'
-              variable: 'CLOUDENV'
+            - file-id: '{packer-cloud-settings}'
+              variable: CLOUDENV
       - inject:
           properties-content: |
               PACKER_PLATFORM={platform}
@@ -96,9 +94,7 @@
     builders:
       - config-file-provider:
           files:
-            - file-id: '{os-cloud-file-id}'
-              target: '$HOME/.config/openstack/clouds.yaml'
-            - file-id: 'packer-cloud-env'
+            - file-id: '{packer-cloud-settings}'
               variable: 'CLOUDENV'
       - inject:
           properties-content: |
@@ -136,11 +132,13 @@
           settings-file: '{settings-file}'
       - inject:
           properties-content: |
+              MAVEN_REPO_URL={maven-repo-url}
               REPO_ID={repo-id}
               GROUP_ID={group-id}
-              UPLOAD_FILES_PATH={files-dir}
+              UPLOAD_FILES_PATH={upload-files-dir}
       - shell: !include-raw-escape:
           - ../shell/lftools-install.sh
+          - ../shell/common-variables.sh
           - ../shell/deploy-maven-file.sh
       - lf-provide-maven-settings-cleanup
 
@@ -268,7 +266,7 @@
               job is triggered by Gerrit.
       - string:
           name: GERRIT_REFSPEC
-          default: ''
+          default: 'refs/heads/{branch}'
           description: |
               Parameter to identify a refspec when pulling from Gerrit.