ci: remove legacy SCP CI support
The code removed by this change represents the remaining dead remnants
of the previous SCP CI, which used to piggy-back on the TF-A to run its
testing regime. This scenario is no longer supported, so remove it.
Change-Id: If0ed5096f7e208c0865f9aac9c15ab4beddc8c6b
Signed-off-by: Chris Kay <chris.kay@arm.com>
diff --git a/script/gen_test_desc.py b/script/gen_test_desc.py
index 47d7e7c..030e7c8 100755
--- a/script/gen_test_desc.py
+++ b/script/gen_test_desc.py
@@ -33,29 +33,23 @@
# Perform group-specific translation on the build config
def translate_build_config(group, config_list):
# config_list contains build configs as read from the test config
- if group.startswith("scp-"):
- # SCP configs would be specified in the following format:
- # scp_config, tf_config, tftf_config, scp_tools
- # Reshuffle them into the canonical format
- config_list = [config_list[1], config_list[2], config_list[0], config_list[3]]
-
if group.startswith("spm-"):
# SPM configs would be specified in the following format:
- # spm_config, tf_config, tftf_config, scp_config, scp_tools
+ # spm_config, tf_config, tftf_config
# Reshuffle them into the canonical format
- config_list = [config_list[1], config_list[2], config_list[3], config_list[4], config_list[0]]
+ config_list = [config_list[1], config_list[2], config_list[0]]
if group.startswith("rmm-"):
# RMM configs would be specified in the following format:
- # rmm_config, tf_config, tftf_config, spm_config, scp_config, scp_tools
+ # rmm_config, tf_config, tftf_config, spm_config
# Reshuffle them into the canonical format
- config_list = [config_list[1], config_list[2], config_list[4], config_list[5], config_list[3], config_list[0]]
+ config_list = [config_list[1], config_list[2], config_list[3], config_list[0]]
if group.startswith("tf-l3-code-coverage"):
# coverage configs would be specified in the following format:
- # tf_config, tftf_config, spm_config, scp_config, scp_tools
+ # tf_config, tftf_config, spm_config
# Reshuffle them into the canonical format
- config_list = [config_list[0], config_list[1], config_list[3], config_list[4], config_list[2]]
+ config_list = [config_list[0], config_list[1], config_list[2]]
return config_list
@@ -66,9 +60,9 @@
build_config, run_config = test.split(":")
# Test descriptors are always generated in the following order:
- # tf_config, tftf_config, scp_config, scp_tools, spm_config, rmm_config
+ # tf_config, tftf_config, spm_config, rmm_config
# Fill missing configs to the right with "nil".
- config_list = (build_config.split(",") + ["nil"] * 6)[:6]
+ config_list = (build_config.split(",") + ["nil"] * 4)[:4]
# Perform any group-specific translation on the config
config_list = translate_build_config(group, config_list)