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/script/scratch_scripts/fast-forward-master.sh b/script/scratch_scripts/fast-forward-master.sh
index 53c9591..bbdfa51 100755
--- a/script/scratch_scripts/fast-forward-master.sh
+++ b/script/scratch_scripts/fast-forward-master.sh
@@ -23,7 +23,7 @@
# On OpenCI, disable push for now, until we're confident enough we want to do
# this automatically. See comments in https://linaro.atlassian.net/browse/TFC-223.
-if echo "$JENKINS_URL" | grep -q "arm.com"; then
+if echo "$JENKINS_URL" | grep -q "oss.arm.com"; then
git push origin master
fi