ci configuration without ARMCLANG compiler

This adds a configuration group similar to the "ci" filter group but
without any ARMCLANG options.
Also adds a configuration group similar to the "full" filter group but
without any ARMMCLANG options.

Change-Id: Iad81bc7605f090e49472a166496d82a19e25f8b5
Signed-off-by: Dean Birch <dean.birch@arm.com>
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 0372fc1..d56c4c3 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -321,6 +321,30 @@
                }
 
 # Configure build manager to build the maximum number of configurations
+config_full_gnuarm = {"seed_params": {
+               "target_platform": ["AN521", "AN519",
+                                   "MUSCA_A", "MUSCA_B1",
+                                   "AN524", "AN539"],
+               "compiler": ["ARMCLANG", "GNUARM"],
+               "proj_config": ["ConfigRegression",
+                               "ConfigRegressionIPC",
+                               "ConfigRegressionIPCTfmLevel2",
+                               "ConfigCoreIPC",
+                               "ConfigCoreIPCTfmLevel2",
+                               "ConfigDefault"],
+               "cmake_build_type": ["Debug", "Release"],
+               "with_mcuboot": [True, False],
+               },
+               "common_params": _common_tfm_builder_cfg,
+               # invalid configuations can be added as tuples of adjustable
+               # resolution "AN521" will reject all combinations for that
+               # platform while ("AN521", "GNUARM") will only reject GCC ones
+               "invalid": [("MUSCA_A", "*", "*", "*", False),
+                           ("MUSCA_B1", "*", "*", "*", False),
+                           ("*", "ARMCLANG", "*", "*", "*")]
+               }
+
+# Configure build manager to build the maximum number of configurations
 config_tfm_test = {"seed_params": {
                   "target_platform": ["AN521", "MUSCA_A", "MUSCA_B1", "MUSCA_S1"],
                   "compiler": ["ARMCLANG", "GNUARM"],
@@ -545,6 +569,29 @@
     ],
 }
 
+# Configuration used in CI if armclang not available
+config_ci_gnuarm = {
+    "seed_params": {
+        "target_platform": ["AN521"],
+        "compiler": ["ARMCLANG", "GNUARM"],
+        "proj_config": ["ConfigDefault", "ConfigCoreIPCTfmLevel2", "ConfigCoreIPC", "ConfigRegression"],
+        "cmake_build_type": ["Release"],
+        "with_mcuboot": [True, False],
+    },
+    "common_params": _common_tfm_builder_cfg,
+    "invalid": [
+        ("AN521", "ARMCLANG", "ConfigDefault", "Release", False),
+        ("AN521", "ARMCLANG", "ConfigCoreIPCTfmLevel2", "Release", False),
+        ("AN521", "ARMCLANG", "ConfigCoreIPCTfmLevel2", "Release", True),
+        ("AN521", "ARMCLANG", "ConfigCoreIPC", "Release", False),
+        ("AN521", "ARMCLANG", "ConfigCoreIPC", "Release", True),
+        ("AN521", "ARMCLANG", "ConfigRegression", "Release", False),
+        ("AN521", "ARMCLANG", "ConfigRegression", "Release", True),
+        ("*", "ARMCLANG", "*", "*", "*"),  # Disable ARMCLANG for now
+    ],
+}
+
+
 config_lava_debug = {
     "seed_params": {
         "target_platform": ["AN521"],
@@ -569,6 +616,7 @@
                     "psa_ff": config_PSA_FF,
                     "psa_ff_otp": config_PSA_FF_OTP,
                     "full": config_full,
+                    "full_gnuarm": config_full_gnuarm,
                     "an539": config_AN539,
                     "an524": config_AN524,
                     "an521": config_AN521,
@@ -583,7 +631,8 @@
                     "an521_psa_ipc": config_AN521_PSA_IPC,
                     "debug": config_debug,
                     "lava_debug": config_lava_debug,
-                    "ci": config_ci}
+                    "ci": config_ci,
+                    "ci_gnuarm": config_ci_gnuarm}
 
 if __name__ == '__main__':
     import os