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
Release global-jjb v0.10.3
[releng/global-jjb.git]
/
jjb
/
lf-rtd-jobs.yaml
diff --git
a/jjb/lf-rtd-jobs.yaml
b/jjb/lf-rtd-jobs.yaml
index
928b567
..
8e9def9
100644
(file)
--- a/
jjb/lf-rtd-jobs.yaml
+++ b/
jjb/lf-rtd-jobs.yaml
@@
-24,15
+24,7
@@
- lf_rtd_common: &lf_rtd_common
name: lf-rtd-common
# RTD verify and merge jobs are the same except for their scm, trigger, and
- lf_rtd_common: &lf_rtd_common
name: lf-rtd-common
# RTD verify and merge jobs are the same except for their scm, trigger, and
- # builders definition. This anchor is the common template
- #
- # Optional parameters:
- # :gerrit_trigger_file_paths: Override file paths which can be used to
- # filter which file modifications will trigger a build.
- # (default: - compare-type: ANT
- # pattern: '**/*.rst'
- # - compare-type: ANT
- # pattern: '**/conf.py')
+ # builders definition. This anchor is the common template.
######################
# Default parameters #
######################
# Default parameters #
@@
-82,18
+74,30
@@
#
# Required parameters:
#
#
# Required parameters:
#
+ # :build-node: The node to run build on.
+ # :jenkins-ssh-credential: Credential to use for SSH. (Generally should
+ # be configured in defaults.yaml)
# :rtd-project: This is the name of the project on ReadTheDocs.org.
#
# Optional parameters:
#
# :branch: Git branch to fetch for the build. (default: master)
# :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7)
# :rtd-project: This is the name of the project on ReadTheDocs.org.
#
# Optional parameters:
#
# :branch: Git branch to fetch for the build. (default: master)
# :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7)
- # :build-node: The node to run build on.
# :build-timeout: Timeout in seconds before aborting build. (default: 15)
# :git-url: base URL of git project. (default: https://github.com)
# :project-pattern: Project to trigger build against. (default: **)
# :stream: Keyword that can be used to represent a release code-name.
# Often the same as the branch. (default: master)
# :build-timeout: Timeout in seconds before aborting build. (default: 15)
# :git-url: base URL of git project. (default: https://github.com)
# :project-pattern: Project to trigger build against. (default: **)
# :stream: Keyword that can be used to represent a release code-name.
# Often the same as the branch. (default: master)
+ # :submodule-recursive: Whether to checkout submodules recursively.
+ # (default: true)
+ #
+ # :gerrit_merge_triggers: Override Gerrit Triggers.
+ # :gerrit_trigger_file_paths: Override file paths which can be used to
+ # filter which file modifications will trigger a build.
+ # (default: - compare-type: ANT
+ # pattern: '**/*.rst'
+ # - compare-type: ANT
+ # pattern: '**/conf.py')
######################
# Default parameters #
######################
# Default parameters #
@@
-107,6
+111,11
@@
stream: master
submodule-recursive: true
stream: master
submodule-recursive: true
+ gerrit_merge_triggers:
+ - change-merged-event
+ - comment-added-contains-event:
+ comment-contains-value: remerge$
+
#####################
# Job Configuration #
#####################
#####################
# Job Configuration #
#####################
@@
-125,10
+134,7
@@
triggers:
- gerrit:
server-name: '{gerrit-server-name}'
triggers:
- gerrit:
server-name: '{gerrit-server-name}'
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge$'
+ trigger-on: '{obj:gerrit_merge_triggers}'
projects:
- project-compare-type: 'ANT'
project-pattern: '{project-pattern}'
projects:
- project-compare-type: 'ANT'
project-pattern: '{project-pattern}'
@@
-170,11
+176,13
@@
name: lf-rtd-verify
# Verify job which runs a tox build of the docs project
#
name: lf-rtd-verify
# Verify job which runs a tox build of the docs project
#
- # Required
p
arameters:
+ # Required
P
arameters:
#
#
- # :rtd-project: This is the name of the project on ReadTheDocs.org.
+ # :build-node: The node to run build on.
+ # :jenkins-ssh-credential: Credential to use for SSH. (Generally should
+ # be configured in defaults.yaml)
#
#
- # Optional
p
arameters:
+ # Optional
P
arameters:
#
# :branch: Git branch to fetch for the build. (default: master)
# :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7)
#
# :branch: Git branch to fetch for the build. (default: master)
# :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7)
@@
-188,6
+196,14
@@
# Often the same as the branch. (default: master)
# :submodule-recursive: Whether to checkout submodules recursively.
# (default: true)
# Often the same as the branch. (default: master)
# :submodule-recursive: Whether to checkout submodules recursively.
# (default: true)
+ #
+ # :gerrit_verify_triggers: Override Gerrit Triggers.
+ # :gerrit_trigger_file_paths: Override file paths which can be used to
+ # filter which file modifications will trigger a build.
+ # (default: - compare-type: ANT
+ # pattern: '**/*.rst'
+ # - compare-type: ANT
+ # pattern: '**/conf.py')
######################
# Default parameters #
######################
# Default parameters #
@@
-202,6
+218,15
@@
stream: master
submodule-recursive: true
stream: master
submodule-recursive: true
+ gerrit_verify_triggers:
+ - patchset-created-event:
+ exclude-drafts: true
+ exclude-trivial-rebase: false
+ exclude-no-code-change: false
+ - draft-published-event
+ - comment-added-contains-event:
+ comment-contains-value: recheck$
+
#####################
# Job Configuration #
#####################
#####################
# Job Configuration #
#####################
@@
-220,20
+245,17
@@
scm:
- lf-infra-gerrit-scm:
scm:
- lf-infra-gerrit-scm:
- branch: '
{branch}
'
+ branch: '
$GERRIT_BRANCH
'
jenkins-ssh-credential: '{jenkins-ssh-credential}'
git-url: '{git-url}'
jenkins-ssh-credential: '{jenkins-ssh-credential}'
git-url: '{git-url}'
- refspec: ''
+ refspec: '
$GERRIT_REFSPEC
'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
triggers:
- gerrit:
server-name: '{gerrit-server-name}'
submodule-recursive: '{submodule-recursive}'
choosing-strategy: default
triggers:
- gerrit:
server-name: '{gerrit-server-name}'
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'recheck$'
+ trigger-on: '{obj:gerrit_verify_triggers}'
projects:
- project-compare-type: 'ANT'
project-pattern: '{project-pattern}'
projects:
- project-compare-type: 'ANT'
project-pattern: '{project-pattern}'