X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=7d2cd983104806af1d41cb940a342e098ed79ad2;hb=409ce6156aa5e7b6c24eaac6dc414c0f013983b1;hp=20a5c6b8fd362e87ec82daf85688dc22ca228035;hpb=91d975d5c426a08e82d8a6bbe1e298fa82f2b7b5;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 20a5c6b8..7d2cd983 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -76,7 +76,7 @@
     builders:
       - config-file-provider:
           files:
-            - file-id: packer-cloud-env
+            - file-id: '{packer-cloud-settings}'
               variable: CLOUDENV
       - inject:
           properties-content: |
@@ -94,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: |
@@ -139,6 +137,7 @@
               UPLOAD_FILES_PATH={files-dir}
       - shell: !include-raw-escape:
           - ../shell/lftools-install.sh
+          - ../shell/common-variables.sh
           - ../shell/deploy-maven-file.sh
       - lf-provide-maven-settings-cleanup