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
Fix jenkins-init scripts dir
[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
..
a3893e1
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 #
@@
-102,26
+102,17
@@
gerrit_trigger_file_paths:
- compare-type: REG_EXP
gerrit_trigger_file_paths:
- compare-type: REG_EXP
- pattern: '
.*\.groovy
'
+ pattern: '
jjb/.*
'
- compare-type: REG_EXP
- compare-type: REG_EXP
- pattern: '
.*\.sh
'
+ pattern: '
global-jjb
'
- compare-type: REG_EXP
- compare-type: REG_EXP
- pattern: '.*\.bat'
- - compare-type: REG_EXP
- pattern: '.*\.ps1'
- - compare-type: REG_EXP
- pattern: '.*\.(yaml|yml)'
- - compare-type: REG_EXP
- pattern: '.*\/global-jjb'
+ pattern: 'shell/.*'
# github_included_regions MUST match gerrit_trigger_file_paths
github_included_regions:
# github_included_regions MUST match gerrit_trigger_file_paths
github_included_regions:
- - '.*\.groovy'
- - '.*\.sh'
- - '.*\.bat'
- - '.*\.ps1'
- - '.*\.(yaml|yml)'
- - '.*\/global-jjb'
+ - 'jjb/.*'
+ - 'global-jjb'
+ - 'shell/.*'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-236,7
+227,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
+236,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
+292,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
+562,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
+671,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
@@
-780,7
+772,7
@@
builders:
- shell: |
builders:
- shell: |
- cd
jjb/
global-jjb
+ cd global-jjb
git fetch https://gerrit.linuxfoundation.org/infra/releng/global-jjb $GERRIT_REFSPEC
git cherry-pick FETCH_HEAD
- lf-infra-jjbini
git fetch https://gerrit.linuxfoundation.org/infra/releng/global-jjb $GERRIT_REFSPEC
git cherry-pick FETCH_HEAD
- lf-infra-jjbini
@@
-1172,12
+1164,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}'
@@
-1308,6
+1318,8
@@
######################
build-timeout: 10
######################
build-timeout: 10
+ openstack: true
+ openstack-cloud: vex
gerrit_verify_triggers:
- patchset-created-event:
gerrit_verify_triggers:
- patchset-created-event:
@@
-1334,6
+1346,8
@@
builders:
- lf-infra-packer-validate:
builders:
- lf-infra-packer-validate:
+ openstack: '{openstack}'
+ openstack-cloud: '{openstack-cloud}'
packer-cloud-settings: '{packer-cloud-settings}'
packer-version: '{packer-version}'
packer-cloud-settings: '{packer-cloud-settings}'
packer-version: '{packer-version}'