Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Rename settings-file to mvn-settings"
[releng/global-jjb.git]
/
jjb
/
lf-macros.yaml
diff --git
a/jjb/lf-macros.yaml
b/jjb/lf-macros.yaml
index
20a5c6b
..
7d3e121
100644
(file)
--- a/
jjb/lf-macros.yaml
+++ b/
jjb/lf-macros.yaml
@@
-94,8
+94,6
@@
builders:
- config-file-provider:
files:
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:
- file-id: 'packer-cloud-env'
variable: 'CLOUDENV'
- inject:
@@
-139,6
+137,7
@@
UPLOAD_FILES_PATH={files-dir}
- shell: !include-raw-escape:
- ../shell/lftools-install.sh
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
- ../shell/deploy-maven-file.sh
- lf-provide-maven-settings-cleanup