Merge "Make Merge and Verify job triggers overrideable"

[releng/global-jjb.git] / jjb / lf-macros.yaml

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 20a5c6b..10a332a 100644 (file)
--- 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: |
@@ -134,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