X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=7d3e1219164fb80ac18bfde437be718c308435de;hb=2534bee091ace950a94db3eab1215c6ed3f77c4c;hp=d0f596b4045946b05e580bfc424931624ac6b8f1;hpb=10821edc619b09e4623884b02900c39431f8a809;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml index d0f596b4..7d3e1219 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-env + variable: CLOUDENV - inject: properties-content: | PACKER_PLATFORM={platform} @@ -96,8 +94,6 @@ builders: - config-file-provider: files: - - file-id: '{os-cloud-file-id}' - target: '$HOME/.config/openstack/clouds.yaml' - file-id: 'packer-cloud-env' variable: 'CLOUDENV' - inject: @@ -141,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