Fix rtd merge job to handle new tag uploaded

[releng/global-jjb.git] / shell / git-validate-jira-urls.sh

diff --git a/shell/git-validate-jira-urls.sh b/shell/git-validate-jira-urls.sh
index e542c45..4a10772 100644 (file)
--- a/shell/git-validate-jira-urls.sh
+++ b/shell/git-validate-jira-urls.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
+# SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
 #
@@ -8,7 +8,7 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
-
+echo "---> git-validate-jira-urls.sh"
 # This script will make sure that there are no JIRA URLs in the commit
 # message. JIRA URLs will break the its-jira plugin
 
@@ -20,8 +20,9 @@ set +u
 
 if [ -n "${JIRA_URL}" ];
 then
-  JIRA_LINK=$(git rev-list --format=%B --max-count=1 HEAD | grep -io 'http[s]*://jira\..*' || true)
-  if [[ ! -z "$JIRA_LINK" ]]
+  BASE_URL=$(echo "$JIRA_URL" | awk -F'/' '{print $3}')
+  JIRA_LINK=$(git rev-list --format=%B --max-count=1 HEAD | grep -io "http[s]*://$BASE_URL/" || true)
+  if [[ -n "$JIRA_LINK" ]]
   then
     echo 'Remove JIRA URLs from commit message'
     echo 'Add jira references as: Issue: <JIRAKEY>-<ISSUE#>, instead of URLs'