Account for AWS-CI in Conditionals on CI Type
Several conditions exist in the scripts to see whether they're
running the On-Premises internal CI, or the TF.org CI. They
all check (ultimately) the Jenkins URL as containing "arm.com"
or not.
This does not work with the addition of the AWS CI Jenkins,
whose URL ends in "aws.arm.com". At least as a first step,
this patch changes those tests to look more specifically for
"oss.arm.com" rather than just "arm.com".
This at least seems unlikely to break any existing code, since
previously, Jenkins URLs ending in "arm.com" were always
preceded by "oss."
Signed-off-by: Gary Morrison <gary.morrison@arm.com>
Change-Id: I05fed06296ac989a9a54df82eca3f4018e952606
diff --git a/utils.sh b/utils.sh
index 937cdd6..cf5f82e 100644
--- a/utils.sh
+++ b/utils.sh
@@ -21,7 +21,7 @@
source "$host_env"
else
# Are we running on Arm infrastructure?
- if echo "$JENKINS_URL" | grep -q "arm.com"; then
+ if echo "$JENKINS_URL" | grep -q "oss.arm.com"; then
source "$ci_root/arm-env.sh"
fi
fi
@@ -248,8 +248,8 @@
popd "$target_dir"
}
-# Check if execution is done by Jenkins. If called with a parameter,
-# representing a 'domain', i.e. arm.com, it will also check if
+# See if execution is done by Jenkins. If called with a parameter,
+# representing a 'domain', e.g. arm.com, it will also check if
# JENKINS_URL contains the latter.
is_jenkins_env () {
local domain="${1-}"