Fix default values for CI URL
Change-Id: I70419dbcc3439e4808a146cf4b41063e8ce237ab
Signed-off-by: Zelalem <zelalem.aweke@arm.com>
diff --git a/arm-env.sh b/arm-env.sh
index ca55ef5..ce40ae3 100644
--- a/arm-env.sh
+++ b/arm-env.sh
@@ -15,7 +15,7 @@
# Source repositories.
arm_gerrit_url="gerrit.oss.arm.com"
-tf_ci_repo_url="http://$arm_gerrit_url/pdswinf/ci/pdcs-platforms/platform-ci"
+tf_ci_repo_url="${CI_SRC_REPO_URL:-http://$arm_gerrit_url/pdswinf/ci/pdcs-platforms/platform-ci}"
tf_arm_gerrit_repo="ssh://$arm_gerrit_url:29418/pdcs-platforms/ap/tf-topics.git"
tftf_arm_gerrit_repo="ssh://$arm_gerrit_url:29418/trusted-firmware/tf-a-tests.git"
scp_src_repo_url="${scp_src_repo_url:-http://$arm_gerrit_url/scp/firmware}"
diff --git a/script/scratch_scripts/initial_clone_v2.6.sh b/script/scratch_scripts/initial_clone_v2.6.sh
index 146bd70..8c6aace 100755
--- a/script/scratch_scripts/initial_clone_v2.6.sh
+++ b/script/scratch_scripts/initial_clone_v2.6.sh
@@ -22,7 +22,7 @@
arm_gerrit_url="gerrit.oss.arm.com"
tforg_gerrit_url="review.trustedfirmware.org"
-ci_url="${https://$arm_gerrit_url/pdswinf/ci/pdcs-platforms/platform-ci:-$CI_SRC_REPO_URL}"
+ci_url="${CI_SRC_REPO_URL:-https://$arm_gerrit_url/pdswinf/ci/pdcs-platforms/platform-ci}"
gerrit_server="arm"
if [ "$ci_url" == *${tforg_gerrit_url}* ];then
diff --git a/utils.sh b/utils.sh
index e81cc47..d0ffd1b 100644
--- a/utils.sh
+++ b/utils.sh
@@ -307,7 +307,6 @@
tftf_src_repo_url="${tftf_src_repo_url:-$TFTF_SRC_REPO_URL}"
tftf_src_repo_url="${tftf_src_repo_url:-https://$tforg_gerrit_url/TF-A/tf-a-tests}"
scp_src_repo_url="${scp_src_repo_url:-$SCP_SRC_REPO_URL}"
-tf_ci_repo_url="${tf_ci_repo_url:-$CI_SRC_REPO_URL}"
# FIXME set a sane default for tfa_downloads
tfa_downloads="${tfa_downloads:-file:///downloads/tf-a}"