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
Rename settings-file to mvn-settings
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
4191a9c
..
e0aee72
100644
(file)
--- a/
jjb/lf-ci-jobs.yaml
+++ b/
jjb/lf-ci-jobs.yaml
@@
-105,9
+105,16
@@
- lf_packer: &lf_packer_common
name: lf-packer-common
# Adds wrappers and parameters sections common to packer jobs.
- lf_packer: &lf_packer_common
name: lf-packer-common
# Adds wrappers and parameters sections common to packer jobs.
+
+ ######################
+ # Default parameters #
+ ######################
+
+ build-timeout: 45
+
wrappers:
- lf-infra-wrappers:
wrappers:
- lf-infra-wrappers:
- build-timeout:
60
+ build-timeout:
'{build-timeout}'
jenkins-ssh-credential: '{jenkins-ssh-credential}'
parameters:
jenkins-ssh-credential: '{jenkins-ssh-credential}'
parameters:
@@
-123,12
+130,10
@@
# Adds builders section common to merge packer jobs.
builders:
- lf-infra-packer-validate:
# Adds builders section common to merge packer jobs.
builders:
- lf-infra-packer-validate:
- os-cloud-file-id: '{os-cloud-file-id}'
packer-version: '{packer-version}'
- lf-infra-packer-build:
platform: '{platforms}'
template: '{templates}'
packer-version: '{packer-version}'
- lf-infra-packer-build:
platform: '{platforms}'
template: '{templates}'
- os-cloud-file-id: '{os-cloud-file-id}'
packer-version: '{packer-version}'
- lf_packer_verify_builders: &lf_packer_verify_builders
packer-version: '{packer-version}'
- lf_packer_verify_builders: &lf_packer_verify_builders
@@
-136,7
+141,6
@@
name: lf-packer-verify-builders
builders:
- lf-infra-packer-validate:
name: lf-packer-verify-builders
builders:
- lf-infra-packer-validate:
- os-cloud-file-id: '{os-cloud-file-id}'
packer-version: '{packer-version}'
- parameter:
packer-version: '{packer-version}'
- parameter:
@@
-422,6
+426,7
@@
# Default parameters #
######################
# Default parameters #
######################
+ build-timeout: 10
git-url: '$GIT_URL/$GERRIT_PROJECT'
#####################
git-url: '$GIT_URL/$GERRIT_PROJECT'
#####################
@@
-491,7
+496,7
@@
- lf-infra-github-pr-trigger:
trigger-phrase: '^remerge$'
only-trigger-phrase: true
- lf-infra-github-pr-trigger:
trigger-phrase: '^remerge$'
only-trigger-phrase: true
- status-context: '
JJB
Merge'
+ status-context: '
Packer {platforms}-${templates}
Merge'
permit-all: false
github-hooks: true
github-org: '{github-org}'
permit-all: false
github-hooks: true
github-org: '{github-org}'
@@
-508,6
+513,12
@@
# yamllint disable-line rule:key-duplicates
<<: *lf_packer_verify_builders
# yamllint disable-line rule:key-duplicates
<<: *lf_packer_verify_builders
+ ######################
+ # Default parameters #
+ ######################
+
+ build-timeout: 10
+
#####################
# Job Configuration #
#####################
#####################
# Job Configuration #
#####################
@@
-529,7
+540,7
@@
- lf-infra-github-pr-trigger:
trigger-phrase: '^recheck$'
only-trigger-phrase: false
- lf-infra-github-pr-trigger:
trigger-phrase: '^recheck$'
only-trigger-phrase: false
- status-context: '
JJB
Verify'
+ status-context: '
Packer
Verify'
permit-all: true
github-hooks: true
github-org: ''
permit-all: true
github-hooks: true
github-org: ''