X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fgit-validate-jira-urls.sh;h=1a8f1ca130ec353a5e9cfceea00d73b57ad44d45;hb=2a10c83b2d506008cc6c01c134515fb6328e1f3a;hp=d44fec93bc9f19469dd817ef5fcfed776f3e6b38;hpb=9aacd8a21e0fac4177a189e9cf14113b6fbf72b7;p=releng%2Fglobal-jjb.git

diff --git a/shell/git-validate-jira-urls.sh b/shell/git-validate-jira-urls.sh
index d44fec93..1a8f1ca1 100644
--- 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,17 +8,24 @@
 # 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
 
+# Ensure we fail the job if any steps fail.
+# Do not treat undefined variables as errors as in this case we are allowed
+# to have JIRA_URL undefined
 set -e -o pipefail
 set +u
 
-JIRA_LINK=$(git rev-list --format=%B --max-count=1 HEAD | grep -io 'http[s]*://jira\..*')
-if [[ ! -z "$JIRA_LINK" ]]
+if [ -n "${JIRA_URL}" ];
 then
-  echo 'Remove JIRA URLs from commit message'
-  echo 'Add jira references as: Issue: <JIRAKEY>-<ISSUE#>, instead of URLs'
-  exit 1
+  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 [[ ! -z "$JIRA_LINK" ]]
+  then
+    echo 'Remove JIRA URLs from commit message'
+    echo 'Add jira references as: Issue: <JIRAKEY>-<ISSUE#>, instead of URLs'
+    exit 1
+  fi
 fi