Revert "utils: use different artifacts for tfa-next on fvp"
This reverts commit 1eb7de0660330a1bd361413030523dd8c153ef04.
Now that the tfa-next jobs are public, so are their generated binaries.
Because of this, we should not upload said binaries to a public S3
bucket anymore.
Change-Id: I258ee2bf854876c6584aca2da8388c779384bace
Signed-off-by: Tomás González <tomasagustin.gonzalezorlando@arm.com>
diff --git a/run_config/fvp-rfa b/run_config/fvp-rfa
index 3e5507d..4a53b80 100644
--- a/run_config/fvp-rfa
+++ b/run_config/fvp-rfa
@@ -19,5 +19,5 @@
model="$model" arch_version="8.4" gen_model_params
- model="$model" next_bin="1" gen_fvp_yaml
+ model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-rfa.rme b/run_config/fvp-rfa.rme
index ebc840a..c1d9f17 100644
--- a/run_config/fvp-rfa.rme
+++ b/run_config/fvp-rfa.rme
@@ -50,5 +50,5 @@
has_rng="1" \
gen_model_params
- model="$model" next_bin="1" gen_fvp_yaml
+ model="$model" gen_fvp_yaml
}
diff --git a/utils.sh b/utils.sh
index f5f4e66..5ef8c31 100644
--- a/utils.sh
+++ b/utils.sh
@@ -184,16 +184,10 @@
# Generate link to an archived binary.
gen_bin_url() {
local bin_mode="${bin_mode:?}"
- local next_bin="${next_bin:?}"
local bin="${1:?}"
if upon "$jenkins_run"; then
- if upon "$next_bin"; then
- date_time="$(date +'%Y-%m-%d-%H%M%S')"
- echo "https://downloads.trustedfirmware.org/tf-a/next/artifacts/$date_time/$bin_mode/$bin"
- else
- echo "$jenkins_url/job/$JOB_NAME/$BUILD_NUMBER/artifact/artefacts/$bin_mode/$bin"
- fi
+ echo "$jenkins_url/job/$JOB_NAME/$BUILD_NUMBER/artifact/artefacts/$bin_mode/$bin"
else
echo "file://$workspace/artefacts/$bin_mode/$bin"
fi