diff --git dev-support/jenkins-common.sh dev-support/jenkins-common.sh index 6aa5273..473fd16 100644 --- dev-support/jenkins-common.sh +++ dev-support/jenkins-common.sh @@ -49,7 +49,11 @@ 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 test -n "$BUILD_TAG" + then + build_postfix=" - ${BUILD_TAG%-*}" + fi + 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 +100,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 +}