fix: use the correct FVP_RD_1_AE locally
It is in a different path.
Also fix fetch_and_archive as can generate errors.
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
Change-Id: Ib0554483489784737238b62167bf3f67bcebc98c
diff --git a/model/rd1ae.sh b/model/rd1ae.sh
index e86ffa1..dda4314 100644
--- a/model/rd1ae.sh
+++ b/model/rd1ae.sh
@@ -5,9 +5,8 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-if is_arm_jenkins_env || upon "$local_ci"; then
- # Internal ARM Jenkins environment path
- set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_RD_1_AE"
+if upon "$local_ci"; then
+ set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_RD_1_AE"
else
source "$ci_root/fvp_utils.sh"
# fvp_models variable contains the information for FVP paths, where 2nd field
diff --git a/utils.sh b/utils.sh
index 84b5a41..13cd9af 100644
--- a/utils.sh
+++ b/utils.sh
@@ -159,7 +159,7 @@
fetch_and_archive() {
url=${url:?}
- filename=${filename:-basename $url}
+ filename=${filename:-$(basename $url)}
url="$url" saveas="$filename" fetch_file
archive_file "$filename"