From a97f48ea67f1bd469d25ae816d7ba66786ecd68a Mon Sep 17 00:00:00 2001 From: Aric Gardner Date: Thu, 17 May 2018 16:05:51 -0400 Subject: [PATCH] Support recheck and reverify in global-jjb In OPNFV we are using reverify as a convention (we also support recheck) This was previously deprecated in global-jjb But I'm adding it back to not confuse our users Change-Id: Ie794636e49f97ff2ac2735e81c407b57a3470f55 Signed-off-by: Aric Gardner --- jjb/lf-ci-jobs.yaml | 12 ++++++------ jjb/lf-maven-jobs.yaml | 9 +++++---- jjb/lf-node-jobs.yaml | 4 ++-- jjb/lf-python-jobs.yaml | 4 ++-- jjb/lf-rtd-jobs.yaml | 4 ++-- shell/gerrit-fetch-dependencies.sh | 4 +++- 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index ed6a5c5b..be002556 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -630,7 +630,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: recheck$ + comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' ##################### # Job Configuration # @@ -712,7 +712,7 @@ triggers: - github-pull-request: - trigger-phrase: '^recheck$' + trigger-phrase: '^(recheck|reverify)$' only-trigger-phrase: false status-context: 'JJB Verify' permit-all: true @@ -862,7 +862,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: recheck$ + comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' ##################### # Job Configuration # @@ -929,7 +929,7 @@ triggers: - github-pull-request: - trigger-phrase: '^recheck$' + trigger-phrase: '^(recheck|reverify)$' only-trigger-phrase: false status-context: 'INFO File Verify' permit-all: true @@ -1086,7 +1086,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: recheck$ + comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' gerrit_trigger_file_paths: - compare-type: REG_EXP @@ -1171,7 +1171,7 @@ triggers: - github-pull-request: - trigger-phrase: '^recheck$' + trigger-phrase: '^(recheck|reverify)$' only-trigger-phrase: false status-context: 'Packer Verify' permit-all: true diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml index b1872a15..5e33b897 100644 --- a/jjb/lf-maven-jobs.yaml +++ b/jjb/lf-maven-jobs.yaml @@ -410,7 +410,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: recheck$ + comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' ##################### # Job Configuration # @@ -480,7 +480,7 @@ triggers: - github-pull-request: - trigger-phrase: '^recheck$' + trigger-phrase: ^(recheck|reverify)$ only-trigger-phrase: false status-context: 'Maven Javadoc Verify' permit-all: true @@ -916,7 +916,8 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: recheck$ + comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' + gerrit_trigger_file_paths: - compare-type: REG_EXP pattern: '.*' @@ -1001,7 +1002,7 @@ triggers: - github-pull-request: - trigger-phrase: '^recheck$' + trigger-phrase: '^(recheck|reverify)$' only-trigger-phrase: false status-context: 'Maven Verify' permit-all: true diff --git a/jjb/lf-node-jobs.yaml b/jjb/lf-node-jobs.yaml index fb27ed7d..106fbdc7 100644 --- a/jjb/lf-node-jobs.yaml +++ b/jjb/lf-node-jobs.yaml @@ -97,7 +97,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: recheck$ + comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' ##################### # Job Configuration # @@ -144,7 +144,7 @@ triggers: - github-pull-request: - trigger-phrase: '^recheck$' + trigger-phrase: '^(recheck|reverify)$' only-trigger-phrase: false status-context: 'Node Verify' permit-all: true diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml index e55f11c0..f95f575a 100644 --- a/jjb/lf-python-jobs.yaml +++ b/jjb/lf-python-jobs.yaml @@ -476,7 +476,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: recheck$ + comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' ##################### # Job Configuration # @@ -524,7 +524,7 @@ triggers: - github-pull-request: - trigger-phrase: '^recheck$' + trigger-phrase: '^(recheck|reverify)$' only-trigger-phrase: false status-context: 'Tox Verify' permit-all: true diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml index 3c21dbc5..dd6301df 100644 --- a/jjb/lf-rtd-jobs.yaml +++ b/jjb/lf-rtd-jobs.yaml @@ -175,7 +175,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: recheck$ + comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' ##################### # Job Configuration # @@ -237,7 +237,7 @@ triggers: - github-pull-request: - trigger-phrase: '^recheck$' + trigger-phrase: '^(recheck|reverify)$' only-trigger-phrase: false status-context: 'RTD Verify' permit-all: true diff --git a/shell/gerrit-fetch-dependencies.sh b/shell/gerrit-fetch-dependencies.sh index 1cb51774..30ba7c86 100644 --- a/shell/gerrit-fetch-dependencies.sh +++ b/shell/gerrit-fetch-dependencies.sh @@ -13,6 +13,8 @@ # Takes a list of Gerrit patches and fetches all projects and cherry-pick # patches for projects. The trigger is # 'recheck: SPACE_SEPERATED_LIST_OF_PATCHES' +# or +# 'reverify: SPACE_SEPERATED_LIST_OF_PATCHES' # # NOTE: This script assumes the user will provide the correct dependency order # via the PATCHES list. @@ -22,7 +24,7 @@ set -eu -o pipefail REPOS_DIR="$WORKSPACE/.repos" -IFS=" " read -r -a PATCHES <<< "$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'recheck:' | awk -F: '{print $2}')" +IFS=" " read -r -a PATCHES <<< "$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep -E '(recheck:|reverify:)' | awk -F: '{print $2}')" # Workaround for git-review bug in v1.24 # https://storyboard.openstack.org/#!/story/2001081 -- 2.16.6