Add missing trigger "remerge" to the PyPI release merge template.
Move trigger definitions into PyPI templates, instead of defining
four separate trigger definition blocks and using each exactly once.
Document the required comment text for the triggers.
Change-Id: I9c12b89a2e3ded80407e6399c62f6e9337bf5cd7
Issue-Id: RELENG-2317
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
- gerrit-pypi-merge
- github-pypi-merge
- gerrit-pypi-merge
- github-pypi-merge
-:Comment Trigger: pypi-remerge
+:Comment Trigger: remerge
- gerrit-pypi-release-verify
- github-pypi-release-verify
- gerrit-pypi-release-verify
- github-pypi-release-verify
+:Comment Trigger: recheck
+
:Required Parameters:
:build-node: The node to run build on, which must be Centos.
:Required Parameters:
:build-node: The node to run build on, which must be Centos.
- gerrit-pypi-release-merge
- github-pypi-release-merge
- gerrit-pypi-release-merge
- github-pypi-release-merge
+:Comment Trigger: remerge
+
:Required Parameters:
:build-node: The node to run build on, which must be Centos.
:Required Parameters:
:build-node: The node to run build on, which must be Centos.
pre-build-script: "# pre-build script goes here"
python-version: python3
stream: master
pre-build-script: "# pre-build script goes here"
python-version: python3
stream: master
+ submodule-disable: false
submodule-recursive: true
submodule-timeout: 10
submodule-recursive: true
submodule-timeout: 10
- submodule-disable: false
tox-dir: "."
tox-envs: ""
tox-dir: "."
tox-envs: ""
<<: *lf_pypi_common
<<: *lf_pypi_verify_builders
<<: *lf_pypi_common
<<: *lf_pypi_verify_builders
- 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: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
-
scm:
- lf-infra-gerrit-scm:
jenkins-ssh-credential: "{jenkins-ssh-credential}"
scm:
- lf-infra-gerrit-scm:
jenkins-ssh-credential: "{jenkins-ssh-credential}"
triggers:
- gerrit:
server-name: "{gerrit-server-name}"
triggers:
- gerrit:
server-name: "{gerrit-server-name}"
- trigger-on: "{obj:gerrit_verify_triggers}"
+ trigger-on:
+ - 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: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
projects:
- project-compare-type: ANT
project-pattern: "{project}"
projects:
- project-compare-type: ANT
project-pattern: "{project}"
cron: ""
pypi-repo: pypi-test
cron: ""
pypi-repo: pypi-test
- gerrit_merge_triggers:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$'
-
scm:
- lf-infra-gerrit-scm:
jenkins-ssh-credential: "{jenkins-ssh-credential}"
scm:
- lf-infra-gerrit-scm:
jenkins-ssh-credential: "{jenkins-ssh-credential}"
- timed: "{obj:cron}"
- gerrit:
server-name: "{gerrit-server-name}"
- timed: "{obj:cron}"
- gerrit:
server-name: "{gerrit-server-name}"
- trigger-on: "{obj:gerrit_merge_triggers}"
+ trigger-on:
+ - change-merged-event
+ - comment-added-contains-event:
+ comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$'
projects:
- project-compare-type: ANT
project-pattern: "{project}"
projects:
- project-compare-type: ANT
project-pattern: "{project}"
<<: *lf_pypi_release_common
<<: *lf_pypi_release_verify_builders
<<: *lf_pypi_release_common
<<: *lf_pypi_release_verify_builders
- 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: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
-
scm:
- lf-infra-gerrit-scm:
jenkins-ssh-credential: "{jenkins-ssh-credential}"
scm:
- lf-infra-gerrit-scm:
jenkins-ssh-credential: "{jenkins-ssh-credential}"
triggers:
- gerrit:
server-name: "{gerrit-server-name}"
triggers:
- gerrit:
server-name: "{gerrit-server-name}"
- trigger-on: "{obj:gerrit_verify_triggers}"
+ trigger-on:
+ - 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: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
projects:
- project-compare-type: "ANT"
project-pattern: "{project}"
projects:
- project-compare-type: "ANT"
project-pattern: "{project}"
<<: *lf_pypi_release_common
<<: *lf_pypi_release_merge_builders
<<: *lf_pypi_release_common
<<: *lf_pypi_release_merge_builders
- gerrit_release_triggers:
- - change-merged-event
-
scm:
- lf-infra-gerrit-scm:
jenkins-ssh-credential: "{jenkins-ssh-credential}"
scm:
- lf-infra-gerrit-scm:
jenkins-ssh-credential: "{jenkins-ssh-credential}"
triggers:
- gerrit:
server-name: "{gerrit-server-name}"
triggers:
- gerrit:
server-name: "{gerrit-server-name}"
- trigger-on: "{obj:gerrit_release_triggers}"
+ trigger-on:
+ - change-merged-event
+ - comment-added-contains-event:
+ comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$'
projects:
- project-compare-type: "ANT"
project-pattern: "{project}"
projects:
- project-compare-type: "ANT"
project-pattern: "{project}"
--- /dev/null
+---
+fixes:
+ - |
+ Add missing trigger "remerge" to the PyPI release merge template.
+ Move trigger definitions into PyPI templates, instead of defining
+ four separate trigger definition blocks and using each exactly once.
+ Document the required comment text for the triggers.