Configs: Separate S1/B1 NSOFF configs into separate groups

Have musca_b1 and musca_s1 for S+NS configuration groups, and
musca_b1_nsoff and musca_s1_nsoff with NSOFF configurations.
The latter have problems with artefacts currently not being
correctly available in CI so they need some more work in the
CI scripts to be runnable.

Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
Change-Id: I7a1af1a1c3e909e34616f437749da7c9476c9aca
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 1660675..2a37766 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -243,30 +243,30 @@
 
     # (Optional) If set will fail if those artefacts are missing post build
     "required_artefacts": {"all": [
-                           "%(ci_build_root_dir)s/spe/bin/"
-                           "tfm_s.bin",
-                           "%(ci_build_root_dir)s/nspe/"
-                           "tfm_ns.bin"],
+                               "%(ci_build_root_dir)s/spe/bin/"
+                               "tfm_s.bin",
+                               "%(ci_build_root_dir)s/nspe/"
+                               "tfm_ns.bin"],
                            "arm/musca_b1": [
-                           "%(ci_build_root_dir)s/tfm.hex",
-                           "%(ci_build_root_dir)s/spe/bin/"
-                           "bl2.bin",
-                           "%(ci_build_root_dir)s/spe/bin/"
-                           "tfm_sign.bin"],
+                               "%(ci_build_root_dir)s/tfm.hex",
+                               "%(ci_build_root_dir)s/spe/bin/"
+                               "bl2.bin",
+                               "%(ci_build_root_dir)s/spe/bin/"
+                               "tfm_sign.bin"],
                            "arm/musca_s1": [
-                           "%(ci_build_root_dir)s/tfm.hex",
-                           "%(ci_build_root_dir)s/spe/bin/"
-                           "bl2.bin",
-                           "%(ci_build_root_dir)s/spe/bin/"
-                           "tfm_sign.bin"],
+                               "%(ci_build_root_dir)s/tfm.hex",
+                               "%(ci_build_root_dir)s/spe/bin/"
+                               "bl2.bin",
+                               "%(ci_build_root_dir)s/spe/bin/"
+                               "tfm_sign.bin"],
                            "arm/rse/tc/tc3": [
-                           "%(ci_build_root_dir)s/spe/bin/rom.bin",
-                           "%(ci_build_root_dir)s/spe/bin/provisioning/combined_provisioning_message.bin",
-                           "%(ci_build_root_dir)s/spe/bin/host_flash.bin"],
+                               "%(ci_build_root_dir)s/spe/bin/rom.bin",
+                               "%(ci_build_root_dir)s/spe/bin/provisioning/combined_provisioning_message.bin",
+                               "%(ci_build_root_dir)s/spe/bin/host_flash.bin"],
                            "arm/rse/tc/tc4": [
-                           "%(ci_build_root_dir)s/spe/bin/rom.bin",
-                           "%(ci_build_root_dir)s/spe/bin/provisioning/combined_provisioning_message.bin",
-                           "%(ci_build_root_dir)s/spe/bin/host_flash.bin"]
+                               "%(ci_build_root_dir)s/spe/bin/rom.bin",
+                               "%(ci_build_root_dir)s/spe/bin/provisioning/combined_provisioning_message.bin",
+                               "%(ci_build_root_dir)s/spe/bin/host_flash.bin"]
                            }
 }
 
@@ -1008,7 +1008,22 @@
                 "cmake_build_type": ["Debug", "Release"],
                 "with_bl2":         [True],
                 "profile":          [""],
-                "extra_params":     ["", "NSOFF"]
+                "extra_params":     [""]
+                },
+                "common_params": _common_tfm_builder_cfg,
+                "invalid": _common_tfm_invalid_configs + []
+                }
+
+config_musca_b1_nsoff = {"seed_params": {
+                "tfm_platform":     ["arm/musca_b1"],
+                "compiler":         ["GCC_13_2", "ARMCLANG_6_21"],
+                "isolation_level":  ["1", "2", "3"],
+                "test_regression":  ["OFF", "RegBL2, RegS, RegNS"],
+                "test_psa_api":     ["OFF"],
+                "cmake_build_type": ["Debug", "Release"],
+                "with_bl2":         [True],
+                "profile":          [""],
+                "extra_params":     ["NSOFF"]
                 },
                 "common_params": _common_tfm_builder_cfg,
                 "invalid": _common_tfm_invalid_configs + []
@@ -1023,7 +1038,22 @@
                 "cmake_build_type": ["Debug", "Release"],
                 "with_bl2":         [True],
                 "profile":          [""],
-                "extra_params":     ["", "NSOFF"]
+                "extra_params":     [""]
+                },
+                "common_params": _common_tfm_builder_cfg,
+                "invalid": _common_tfm_invalid_configs + []
+                }
+
+config_musca_s1_nsoff = {"seed_params": {
+                "tfm_platform":     ["arm/musca_s1"],
+                "compiler":         ["GCC_13_2", "ARMCLANG_6_21"],
+                "isolation_level":  ["1", "2"],
+                "test_regression":  ["OFF", "RegBL2, RegS, RegNS"],
+                "test_psa_api":     ["OFF"],
+                "cmake_build_type": ["Debug", "Release"],
+                "with_bl2":         [True],
+                "profile":          [""],
+                "extra_params":     ["NSOFF"]
                 },
                 "common_params": _common_tfm_builder_cfg,
                 "invalid": _common_tfm_invalid_configs + []
@@ -1597,7 +1627,9 @@
                     "cs300_an552": config_cs300_an552,
                     "cs300_fvp": config_cs300_fvp,
                     "musca_b1": config_musca_b1,
+                    "musca_b1_nsoff": config_musca_b1_nsoff,
                     "musca_s1": config_musca_s1,
+                    "musca_s1_nsoff": config_musca_s1_nsoff,
                     "corstone310": config_corstone310,
                     "corstone315": config_corstone315,
                     "corstone320": config_corstone320,