Simplify environment checks
- Remove Old Arm environment check prior to moving to Linaro
- In migration and in Linaro OpenCI, environment difference
is only in staging or production site.
Change-Id: Ib2c1bf786b67f354caeb5b3668649c922835cd0f
Signed-off-by: Saheer Babu <saheer.babu@arm.com>
diff --git a/utils.sh b/utils.sh
index e668753..8a28e64 100644
--- a/utils.sh
+++ b/utils.sh
@@ -22,16 +22,10 @@
if [ -n "$host_env" ]; then
source "$host_env"
else
- # Are we running on Arm infrastructure?
- if echo "$JENKINS_PUBLIC_URL" | grep -q "oss.arm.com"; then
- source "$ci_root/arm-env.sh"
- elif echo "$JENKINS_PUBLIC_URL" | grep -q "jenkins.openci"; then
- # This is Arm infrastructure while migration from ci.trustedfirmware.org
+ if echo "$JENKINS_PUBLIC_URL" | grep -q "staging"; then
+ source "$ci_root/openci-staging-env.sh"
+ else
source "$ci_root/openci-env.sh"
- elif echo "$JENKINS_PUBLIC_URL" | grep -q "ci.trustedfirmware.org"; then
- source "$ci_root/openci-env.sh"
- elif echo "$JENKINS_PUBLIC_URL" | grep -q "ci.staging.trustedfirmware.org"; then
- source "$ci_root/openci-staging-env.sh"
fi
fi