diff --git dev-support/jenkins-common.sh dev-support/jenkins-common.sh index 6aa5273..6a3a5a0 100644 --- dev-support/jenkins-common.sh +++ dev-support/jenkins-common.sh @@ -49,7 +49,7 @@ process_jira() { fi # ensure attachment has not already been tested ATTACHMENT_ID=$(basename $(dirname $PATCH_URL)) - if grep -q "ATTACHMENT ID: $ATTACHMENT_ID" $JIRA_TEXT + if grep -q "ATTACHMENT ID: $ATTACHMENT_ID $BUILD_POSTFIX" $JIRA_TEXT then fail "Attachment $ATTACHMENT_ID is already tested for $JIRA_NAME" fi @@ -96,4 +96,4 @@ process_jira() { # Returns 0 if there are changes; non-zero value otherwise. patch_contains_hms_upgrade() { curl -s "$1" | grep "^diff.*metastore/scripts/upgrade/" >/dev/null -} \ No newline at end of file +} diff --git dev-support/jenkins-execute-build.sh dev-support/jenkins-execute-build.sh index 3b41b0b..3a13703 100644 --- dev-support/jenkins-execute-build.sh +++ dev-support/jenkins-execute-build.sh @@ -26,6 +26,7 @@ fi export ROOT=$PWD export JIRA_ROOT_URL="https://issues.apache.org" export BUILD_TAG="${BUILD_TAG##jenkins-}" +export BUILD_POSTFIX=" - ${BUILD_TAG%-*}" if [[ -n "$JIRA_NAME" ]] then echo $JIRA_NAME diff --git dev-support/jenkins-execute-hms-test.sh dev-support/jenkins-execute-hms-test.sh index 52a9453..1e4bd5d 100644 --- dev-support/jenkins-execute-hms-test.sh +++ dev-support/jenkins-execute-hms-test.sh @@ -38,6 +38,7 @@ export JIRA_NAME="HIVE-${ISSUE_NUM}" export ROOT=$PWD export JIRA_ROOT_URL="https://issues.apache.org" export BUILD_TAG="${BUILD_TAG##jenkins-}" +export BUILD_POSTFIX=" - ${BUILD_TAG%-*}" process_jira