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 bug in package-listing start script
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
c34f63d
..
ebf637f
100644
(file)
--- a/
jjb/lf-ci-jobs.yaml
+++ b/
jjb/lf-ci-jobs.yaml
@@
-113,6
+113,11
@@
stream: master
submodule-recursive: true
submodule-timeout: 10
stream: master
submodule-recursive: true
submodule-timeout: 10
+ throttle_categories: []
+ throttle-enabled: false
+ throttle-max-per-node: 1
+ throttle-max-total: 0
+ throttle-option: 'project'
gerrit_trigger_file_paths:
- compare-type: REG_EXP
gerrit_trigger_file_paths:
- compare-type: REG_EXP
@@
-140,6
+145,12
@@
- lf-infra-properties:
project: '{project}'
build-days-to-keep: 7
- lf-infra-properties:
project: '{project}'
build-days-to-keep: 7
+ - throttle:
+ categories: '{obj:throttle_categories}'
+ enabled: '{throttle-enabled}'
+ max-per-node: '{throttle-max-per-node}'
+ max-total: '{throttle-max-total}'
+ option: '{throttle-option}'
parameters:
- lf-infra-parameters:
parameters:
- lf-infra-parameters:
@@
-506,7
+517,7
@@
url: '{git-clone-url}{github-org}/{project}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '$sha1'
url: '{git-clone-url}{github-org}/{project}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '$sha1'
- submodule-recursive:
'{submodule-recursive}'
+ submodule-recursive:
true
submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
submodule-timeout: '{submodule-timeout}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@
-598,7
+609,7
@@
submodule-timeout: 10
gerrit_jjb_deploy_job_triggers:
- comment-added-contains-event:
submodule-timeout: 10
gerrit_jjb_deploy_job_triggers:
- comment-added-contains-event:
- comment-contains-value: '
jjb-deploy[:]* (?!\*+$).+$
'
+ comment-contains-value: '
^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(jjb-deploy[:]* (?!\*+$).+$)
'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-708,6
+719,8
@@
# Default parameters #
######################
# Default parameters #
######################
+ jjb-workers: 0
+
gerrit_merge_triggers:
- change-merged-event
- comment-added-contains-event:
gerrit_merge_triggers:
- change-merged-event
- comment-added-contains-event:
@@
-720,6
+733,8
@@
builders:
- lf-infra-pre-build
- lf-infra-jjbini
builders:
- lf-infra-pre-build
- lf-infra-jjbini
+ - inject:
+ properties-content: JJB_WORKERS={jjb-workers}
- shell: !include-raw-escape:
- ../shell/jjb-install.sh
- ../shell/jjb-merge-job.sh
- shell: !include-raw-escape:
- ../shell/jjb-install.sh
- ../shell/jjb-merge-job.sh
@@
-1402,6
+1417,8
@@
packer-version: '{packer-version}'
platform: '{platforms}'
template: '{templates}'
packer-version: '{packer-version}'
platform: '{platforms}'
template: '{templates}'
+ - description-setter:
+ description: '.*Creating the image:(.*)'
- job-template:
name: '{project-name}-packer-merge-{platforms}-{templates}'
- job-template:
name: '{project-name}-packer-merge-{platforms}-{templates}'