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
Update jobs to use lf-infra-pre-build
[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
..
f8b7b77
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 #
@@
-236,7
+236,7
@@
- inject:
properties-content: 'jenkins_silos={jenkins-silos}'
- shell: !include-raw-escape: ../shell/jenkins-configure-clouds.sh
- inject:
properties-content: 'jenkins_silos={jenkins-silos}'
- shell: !include-raw-escape: ../shell/jenkins-configure-clouds.sh
- - shell: rm "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
+ - shell: rm
-f
"$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
- builder:
name: lf-jenkins-cfg-global-vars
- builder:
name: lf-jenkins-cfg-global-vars
@@
-245,7
+245,7
@@
- inject:
properties-content: 'jenkins_silos={jenkins-silos}'
- shell: !include-raw-escape: ../shell/jenkins-configure-global-vars.sh
- inject:
properties-content: 'jenkins_silos={jenkins-silos}'
- shell: !include-raw-escape: ../shell/jenkins-configure-global-vars.sh
- - shell: rm "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
+ - shell: rm
-f
"$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
- lf_jenkins_configuration: &lf_jenkins_cfg_merge
name: lf-jenkins-cfg-merge
- lf_jenkins_configuration: &lf_jenkins_cfg_merge
name: lf-jenkins-cfg-merge
@@
-301,8
+301,7
@@
jenkins-ssh-credential: '{jenkins-ssh-credential}'
builders:
jenkins-ssh-credential: '{jenkins-ssh-credential}'
builders:
- - shell: !include-raw-escape:
- - ../shell/lftools-install.sh
+ - lf-infra-pre-build
- lf-jenkins-cfg-global-vars:
jenkins-silos: '{jenkins-silos}'
- lf-jenkins-cfg-clouds:
- lf-jenkins-cfg-global-vars:
jenkins-silos: '{jenkins-silos}'
- lf-jenkins-cfg-clouds:
@@
-572,6
+571,7
@@
#####################
builders:
#####################
builders:
+ - lf-infra-pre-build
- lf-infra-jjbini
- shell: !include-raw-escape:
- ../shell/jjb-install.sh
- lf-infra-jjbini
- shell: !include-raw-escape:
- ../shell/jjb-install.sh
@@
-680,6
+680,7
@@
concurrent: true
builders:
concurrent: true
builders:
+ - lf-infra-pre-build
- lf-infra-jjbini
- shell: !include-raw-escape:
- ../shell/git-validate-jira-urls.sh
- lf-infra-jjbini
- shell: !include-raw-escape:
- ../shell/git-validate-jira-urls.sh
@@
-1172,12
+1173,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}'