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
Merge "Add lf-infra-wss-mvn-clean-install step"
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
8a49d03
..
bdebb0f
100644
(file)
--- a/
jjb/lf-ci-jobs.yaml
+++ b/
jjb/lf-ci-jobs.yaml
@@
-484,11
+484,11
@@
scm:
- lf-infra-gerrit-scm:
git-url: '{git-url}'
scm:
- lf-infra-gerrit-scm:
git-url: '{git-url}'
- refspec: '
refs/heads/{branch}
'
- branch: '
{branch}
'
+ refspec: '
$GERRIT_REFSPEC
'
+ branch: '
$GERRIT_BRANCH
'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
submodule-recursive: true
submodule-timeout: '{submodule-timeout}'
- choosing-strategy:
defaul
t
+ choosing-strategy:
gerri
t
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
@@
-719,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:
@@
-731,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