X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fgit-validate-jira-urls.sh;h=0bc9d490cd438b157352a99ddd4dffcf9823e5eb;hb=6eefde1f463638b5021c2ec96eb67a017d379f1f;hp=51d5132a3182aac5d10b1352e9cbe3adc80535b7;hpb=9201487a6faa4386fe2e27089d898d9d4324a77e;p=releng%2Fglobal-jjb.git

diff --git a/shell/git-validate-jira-urls.sh b/shell/git-validate-jira-urls.sh
index 51d5132a..0bc9d490 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.
 #
@@ -12,13 +12,20 @@
 # 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\..*' || true)
-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