commit ee6788ff8d41030a4144fd4f481ad790563dcfeb
author Saheer Babu <saheer.babu@arm.com> Mon Feb 10 17:49:12 2025 +0000
committer Arthur She <arthur.she@linaro.org> Tue Feb 11 15:47:59 2025 +0100
tree 1e430d89d5e15f25809dcdc56bfeb65e16642265
parent 530cbf6e4b4c414fd428438c355426349ce7b0cf

Use environment variable for download server

To ensure tf-a-ci-scripts can run on both OpenCI
and Arm CI, replace ci.trustedfirmware.org with
enironment variable.

DOWNLOAD_SERVER_URL is a system-wide environment
variable and was configured in:
Manage Jenkins > System > Global Properties

Change-Id: I53bbb8766c9264c7cc1200f8884324b6650f31da
Signed-off-by: Saheer Babu <saheer.babu@arm.com>

openci-env.sh

diff --git a/openci-env.sh b/openci-env.sh
index 9b75ab3..1e6a554 100644
--- a/openci-env.sh
+++ b/openci-env.sh
@@ -11,11 +11,11 @@
 
 nfs_volume="${WORKSPACE:?}/nfs"
 jenkins_url="${JENKINS_PUBLIC_URL}"
-tfa_downloads="https://downloads.trustedfirmware.org/tf-a"
+tfa_downloads="${DOWNLOAD_SERVER_URL}/tf-a"
 ci_env="openci"
 
 tfa_branch=${TF_GERRIT_BRANCH##*/}
 if echo $tfa_branch | grep -q "^lts-v"; then
     # LTS branch, change the download space to the respective one
-    tfa_downloads="https://downloads.trustedfirmware.org/tf-a-$tfa_branch"
+    tfa_downloads="${DOWNLOAD_SERVER_URL}/tf-a-$tfa_branch"
 fi

openci-staging-env.sh

diff --git a/openci-staging-env.sh b/openci-staging-env.sh
index c4844cc..b242100 100644
--- a/openci-staging-env.sh
+++ b/openci-staging-env.sh
@@ -11,11 +11,11 @@
 
 nfs_volume="${WORKSPACE:?}/nfs"
 jenkins_url="${JENKINS_PUBLIC_URL}"
-tfa_downloads="https://downloads.trustedfirmware.org/tf-a"
+tfa_downloads="${DOWNLOAD_SERVER_URL}/tf-a"
 ci_env="openci_staging"
 
 tfa_branch=${TF_GERRIT_BRANCH##*/}
 if echo $tfa_branch | grep -q "^lts-v"; then
     # LTS branch, change the download space to the respective one
-    tfa_downloads="https://downloads.trustedfirmware.org/tf-a-$tfa_branch"
+    tfa_downloads="${DOWNLOAD_SERVER_URL}/tf-a-$tfa_branch"
 fi

script/tf-coverity/tf-cov-make

diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index 14ccf63..462e15e 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -544,7 +544,7 @@
 
 # Source files from mv-ddr-marvell repository are necessary
 # to build below four platforms
-wget https://downloads.trustedfirmware.org/tf-a/mv-ddr-marvell/mv-ddr-marvell-5d41a995637de1dbc93f193db6ef0c8954cab316.tar.gz 2> /dev/null
+wget ${DOWNLOAD_SERVER_URL}/tf-a/mv-ddr-marvell/mv-ddr-marvell-5d41a995637de1dbc93f193db6ef0c8954cab316.tar.gz 2> /dev/null
 tar -xzf mv-ddr-marvell-5d41a995637de1dbc93f193db6ef0c8954cab316.tar.gz 2> /dev/null
 mv mv-ddr-marvell drivers/marvell/mv_ddr