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
Use include-regions to limit JenkinsCFG build path
[releng/global-jjb.git]
/
jjb
/
lf-ci-jobs.yaml
diff --git
a/jjb/lf-ci-jobs.yaml
b/jjb/lf-ci-jobs.yaml
index
988f893
..
2b6ab3a
100644
(file)
--- a/
jjb/lf-ci-jobs.yaml
+++ b/
jjb/lf-ci-jobs.yaml
@@
-143,8
+143,12
@@
submodule-recursive: true
gerrit_trigger_file_paths:
submodule-recursive: true
gerrit_trigger_file_paths:
+ - compare-type: ANT
+ pattern: '**/*.groovy'
- compare-type: ANT
pattern: '**/*.sh'
- compare-type: ANT
pattern: '**/*.sh'
+ - compare-type: ANT
+ pattern: '**/*.yml'
- compare-type: ANT
pattern: '**/*.yaml'
- compare-type: ANT
- compare-type: ANT
pattern: '**/*.yaml'
- compare-type: ANT
@@
-289,8
+293,12
@@
comment-contains-value: remerge$
gerrit_trigger_file_paths:
comment-contains-value: remerge$
gerrit_trigger_file_paths:
- - compare-type: ANT
- pattern: 'jenkins-config/**'
+ - compare-type: REG_EXP
+ pattern: 'jenkins-config\/.*'
+
+ # github_included_regions MUST match gerrit_trigger_file_paths
+ github_included_regions:
+ - 'jenkins-config\/.*'
#####################
# Job Configuration #
#####################
# Job Configuration #
@@
-378,16
+386,17
@@
- github
- pollscm:
cron: ''
- github
- pollscm:
cron: ''
- -
lf-infra-github-pr-trigger
:
+ -
github-pull-request
:
trigger-phrase: '^remerge$'
only-trigger-phrase: true
status-context: 'Jenkins CFG Merge'
permit-all: false
github-hooks: true
trigger-phrase: '^remerge$'
only-trigger-phrase: true
status-context: 'Jenkins CFG Merge'
permit-all: false
github-hooks: true
- github-org: '{github-org}'
- github_pr_whitelist: '{obj:github_pr_whitelist}'
- github_pr_admin_list: '{obj:github_pr_admin_list}'
-
+ org-list:
+ - '{github-org}'
+ white-list: '{obj:github_pr_whitelist}'
+ admin-list: '{obj:github_pr_admin_list}'
+ included-regions: '{obj:github_included_regions}'
##################
# JJB DEPLOY JOB #
##################
# JJB DEPLOY JOB #
@@
-461,10
+470,10
@@
trigger-on: '{obj:gerrit_jjb_deploy_job_triggers}'
projects:
- project-compare-type: ANT
trigger-on: '{obj:gerrit_jjb_deploy_job_triggers}'
projects:
- project-compare-type: ANT
- project-pattern: '
{project}
'
+ project-pattern: '
**
'
branches:
- branch-compare-type: ANT
branches:
- branch-compare-type: ANT
- branch-pattern: '**
/{branch}
'
+ branch-pattern: '**'
skip-vote:
success: true
failed: true
skip-vote:
success: true
failed: true
@@
-527,6
+536,7
@@
- 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
+ - ../shell/jjb-cleanup.sh
- job-template:
name: '{project-name}-jjb-merge'
- job-template:
name: '{project-name}-jjb-merge'
@@
-625,6
+635,7
@@
- ../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
+ - ../shell/jjb-cleanup.sh
- lf-infra-gpg-verify-git-signature
- job-template:
- lf-infra-gpg-verify-git-signature
- job-template: