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
Use clouds.yaml for openstack packer builders
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
ec3e48e
..
e9e483e
100644
(file)
--- a/
jjb/lf-ci-jobs.yaml
+++ b/
jjb/lf-ci-jobs.yaml
@@
-37,7
+37,7
@@
stream: master
submodule-recursive: true
packer-cloud-settings: packer-cloud-env
stream: master
submodule-recursive: true
packer-cloud-settings: packer-cloud-env
- packer-version: 1.2.
3
+ packer-version: 1.2.
5
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-1172,12
+1172,30
@@
- lf_packer_merge: &lf_packer_merge
name: lf-packer-merge
- lf_packer_merge: &lf_packer_merge
name: lf-packer-merge
+ ######################
+ # Default parameters #
+ ######################
+
+ openstack: true
+ openstack-cloud: vex
+
#####################
# Job Configuration #
#####################
#####################
# Job Configuration #
#####################
+ parameters:
+ - lf-infra-parameters:
+ project: '{project}'
+ stream: '{stream}'
+ branch: '{branch}'
+ lftools-version: '{lftools-version}'
+ - lf-packer-parameters:
+ packer-version: '{packer-version}'
+
builders:
- lf-infra-packer-build:
builders:
- lf-infra-packer-build:
+ openstack: '{openstack}'
+ openstack-cloud: '{openstack-cloud}'
packer-cloud-settings: '{packer-cloud-settings}'
packer-version: '{packer-version}'
platform: '{platforms}'
packer-cloud-settings: '{packer-cloud-settings}'
packer-version: '{packer-version}'
platform: '{platforms}'