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
Pass common maven options to deploy file builder
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
b1d3646
..
bce5985
100644
(file)
--- a/
jjb/lf-ci-jobs.yaml
+++ b/
jjb/lf-ci-jobs.yaml
@@
-57,10
+57,11
@@
builders:
- lf-infra-jjbini
- shell: !include-raw-escape:
builders:
- lf-infra-jjbini
- shell: !include-raw-escape:
+ - ../shell/git-validate-jira-urls.sh
- ../shell/jjb-install.sh
- ../shell/jjb-verify-job.sh
- ../shell/jjb-check-unicode.sh
- ../shell/jjb-install.sh
- ../shell/jjb-verify-job.sh
- ../shell/jjb-check-unicode.sh
- - gpg-verify-git-signature
+ -
lf-infra-
gpg-verify-git-signature
- parameter:
name: lf-infra-jjb-parameters
- parameter:
name: lf-infra-jjb-parameters
@@
-86,6
+87,7
@@
# Default parameters #
######################
# Default parameters #
######################
+ stream: master
branch: master
submodule-recursive: true
branch: master
submodule-recursive: true
@@
-101,6
+103,7
@@
parameters:
- lf-infra-parameters:
project: '{project}'
parameters:
- lf-infra-parameters:
project: '{project}'
+ stream: '{stream}'
branch: '{branch}'
- lf-infra-jjb-parameters:
jjb-version: '{jjb-version}'
branch: '{branch}'
- lf-infra-jjb-parameters:
jjb-version: '{jjb-version}'
@@
-120,13
+123,24
@@
# yamllint disable-line rule:key-duplicates
<<: *lf_jjb_merge_builders
# yamllint disable-line rule:key-duplicates
<<: *lf_jjb_merge_builders
+ ######################
+ # Default parameters #
+ ######################
+
+ git-url: '$GIT_URL/$GERRIT_PROJECT'
+
+ #####################
+ # Job Configuration #
+ #####################
+
scm:
- lf-infra-gerrit-scm:
scm:
- lf-infra-gerrit-scm:
-
jenkins-ssh-credential: '{jenkins-ssh-credentia
l}'
+
git-url: '{git-ur
l}'
refspec: ''
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
refspec: ''
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
+ jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
- gerrit:
triggers:
- gerrit:
@@
-151,8
+165,19
@@
# yamllint disable-line rule:key-duplicates
<<: *lf_jjb_verify_builders
# yamllint disable-line rule:key-duplicates
<<: *lf_jjb_verify_builders
+ ######################
+ # Default parameters #
+ ######################
+
+ git-url: '$GIT_URL/$GERRIT_PROJECT'
+
+ #####################
+ # Job Configuration #
+ #####################
+
scm:
- lf-infra-gerrit-scm:
scm:
- lf-infra-gerrit-scm:
+ git-url: '{git-url}'
refspec: '$GERRIT_REFSPEC'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
refspec: '$GERRIT_REFSPEC'
branch: '$GERRIT_BRANCH'
submodule-recursive: '{submodule-recursive}'
@@
-185,52
+210,44
@@
# yamllint disable-line rule:key-duplicates
<<: *lf_jjb_merge_builders
# yamllint disable-line rule:key-duplicates
<<: *lf_jjb_merge_builders
- ######################
- # Default parameters #
- ######################
-
- github-url: https://github.com
-
#####################
# Job Configuration #
#####################
properties:
- github:
#####################
# Job Configuration #
#####################
properties:
- github:
- url: '{git
hub
-url}/{github-org}/{project}'
+ url: '{git-url}/{github-org}/{project}'
scm:
- lf-infra-github-scm:
scm:
- lf-infra-github-scm:
- url: '
$GIT_URL/$PROJECT
'
- refspec: '
+refs/pull/*:refs/remotes/origin/pr/*
'
+ url: '
{git-clone-url}{github-org}/{project}
'
+ refspec: ''
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
- - github-pull-request:
+ - github
+ - pollscm:
+ cron: ''
+ - lf-infra-github-pr-trigger:
trigger-phrase: '^remerge$'
only-trigger-phrase: true
status-context: 'JJB Merge'
permit-all: false
github-hooks: true
trigger-phrase: '^remerge$'
only-trigger-phrase: true
status-context: 'JJB Merge'
permit-all: false
github-hooks: true
- auto-close-on-fail: false
- org-list:
-
- '{github-org
}'
+ github-org: '{github-org}'
+ github_pr_whitelist: '{obj:github_pr_whitelist}'
+
github_pr_admin_list: '{obj:github_pr_admin_list
}'
- job-template:
name: '{project-name}-jjb-verify'
id: github-jjb-verify
- job-template:
name: '{project-name}-jjb-verify'
id: github-jjb-verify
+ concurrent: true
<<: *lf_jjb_verify_merge
# yamllint disable-line rule:key-duplicates
<<: *lf_jjb_verify_merge
# yamllint disable-line rule:key-duplicates
- <<: *lf_jjb_merge_builders
-
- ######################
- # Default parameters #
- ######################
-
- github-url: https://github.com
+ <<: *lf_jjb_verify_builders
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-238,11
+255,11
@@
properties:
- github:
properties:
- github:
- url: '{git
hub
-url}/{github-org}/{project}'
+ url: '{git-url}/{github-org}/{project}'
scm:
- lf-infra-github-scm:
scm:
- lf-infra-github-scm:
- url: '
$GIT_URL/$PROJECT
'
+ url: '
{git-clone-url}{github-org}/{project}
'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
branch: '{branch}'
submodule-recursive: '{submodule-recursive}'
@@
-250,10
+267,14
@@
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
jenkins-ssh-credential: '{jenkins-ssh-credential}'
triggers:
- -
github-pull-request
:
+ -
lf-infra-github-pr-trigger
:
trigger-phrase: '^recheck$'
only-trigger-phrase: false
status-context: 'JJB Verify'
permit-all: true
github-hooks: true
trigger-phrase: '^recheck$'
only-trigger-phrase: false
status-context: 'JJB Verify'
permit-all: true
github-hooks: true
- auto-close-on-fail: false
+ github-org: ''
+ github_pr_whitelist:
+ - ''
+ github_pr_admin_list:
+ - ''