Switch all platforms artifacts to use the new build system
TF-M changed binaries name and location since 1.1 release.
After enabling additional platforms (Musca B1 and MPS2 on QEMU),
the infra health check started to fail. The build configs were broken in
the first place, due to workarounds to support mixing old and new build
system. This patch finished the migration to the TF-M new build system
and get rid of the related workarounds, FIXMEs and TODOs.
It requires a new recovery image with an updated images.txt file to
match the new filenames.
* Adjust get_artifact_url() to return bin/ URL.
* Add comments to lava_helper_configs.py to clarify the binaries to use.
* Update the binaries filenames. mcuboot.* and tfm_sign.bin are gone.
* Fix qemu_mps2: nobl2 -> bl2. Rename accordingly.
* Cleanup run-build.sh as we don't need to remove/rename/reshuffle files
anymore.
* Adjust fastmodel_wrapper to the binaries paths and filenames used by
the new build system.
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Change-Id: I8c23cf1d5430b21bb7ee5b232a9125b089792efd
diff --git a/tfm_ci_pylib/fastmodel_wrapper/config_templates.py b/tfm_ci_pylib/fastmodel_wrapper/config_templates.py
index ef87e98..760850e 100644
--- a/tfm_ci_pylib/fastmodel_wrapper/config_templates.py
+++ b/tfm_ci_pylib/fastmodel_wrapper/config_templates.py
@@ -89,8 +89,8 @@
# Set defaults across all variants
_vdict["build_path"] = "build-ci-all"
- _vdict["app_bin_path"] = "install/outputs/fvp"
- _vdict["data_bin_path"] = "install/outputs/fvp"
+ _vdict["app_bin_path"] = "bin/fvp"
+ _vdict["data_bin_path"] = "bin/fvp"
_vdict["variant_name_tpl"] = "%(platform)s_%(compiler)s_%(config)s_" + \
"%(build_type)s_%(bootloader)s"
@@ -122,8 +122,8 @@
# Set defaults across all variants
_vdict["build_path"] = "build-ci-all"
- _vdict["app_bin_path"] = "install/outputs/fvp"
- _vdict["data_bin_path"] = "install/outputs/fvp"
+ _vdict["app_bin_path"] = "bin/fvp"
+ _vdict["data_bin_path"] = "bin/fvp"
_vdict["variant_name_tpl"] = "%(platform)s_%(compiler)s_%(config)s_" + \
"%(build_type)s_%(bootloader)s"
@@ -169,8 +169,8 @@
# Set defaults across all variants
_vdict["build_path"] = "build-ci-all"
- _vdict["app_bin_path"] = "install/outputs/fvp"
- _vdict["data_bin_path"] = "install/outputs/fvp"
+ _vdict["app_bin_path"] = "bin/fvp"
+ _vdict["data_bin_path"] = "bin/fvp"
_vdict["variant_name_tpl"] = "%(platform)s_%(compiler)s_%(config)s_" + \
"%(build_type)s_%(bootloader)s"
@@ -205,8 +205,8 @@
# Set defaults across all variants
_vdict["build_path"] = "build-ci-all"
- _vdict["app_bin_path"] = "install/outputs/fvp"
- _vdict["data_bin_path"] = "install/outputs/fvp"
+ _vdict["app_bin_path"] = "bin/fvp"
+ _vdict["data_bin_path"] = "bin/fvp"
_vdict["variant_name_tpl"] = "%(platform)s_%(compiler)s_%(config)s_" + \
"%(build_type)s_%(bootloader)s"
@@ -241,8 +241,8 @@
# Set defaults across all variants
_vdict["build_path"] = "build-ci-all"
- _vdict["app_bin_path"] = "install/outputs/fvp"
- _vdict["data_bin_path"] = "install/outputs/fvp"
+ _vdict["app_bin_path"] = "bin/fvp"
+ _vdict["data_bin_path"] = "bin/fvp"
_vdict["variant_name_tpl"] = "%(platform)s_%(compiler)s_%(config)s_" + \
"%(psa_suite)s_%(build_type)s_%(bootloader)s"
@@ -276,8 +276,8 @@
# Set defaults across all variants
_vdict["build_path"] = "build-ci-all"
- _vdict["app_bin_path"] = "install/outputs/fvp"
- _vdict["data_bin_path"] = "install/outputs/fvp"
+ _vdict["app_bin_path"] = "bin/fvp"
+ _vdict["data_bin_path"] = "bin/fvp"
_vdict["variant_name_tpl"] = "%(platform)s_%(compiler)s_%(config)s_" + \
"%(psa_suite)s_%(build_type)s_%(bootloader)s"
@@ -311,8 +311,8 @@
# Set defaults across all variants
_vdict["build_path"] = "build-ci-all"
- _vdict["app_bin_path"] = "install/outputs/fvp"
- _vdict["data_bin_path"] = "install/outputs/fvp"
+ _vdict["app_bin_path"] = "bin/fvp"
+ _vdict["data_bin_path"] = "bin/fvp"
_vdict["variant_name_tpl"] = "%(platform)s_%(compiler)s_%(config)s_" + \
"%(psa_suite)s_%(build_type)s_%(bootloader)s"