Build: Update CS1K build configs

Following changes are made for CS1K build configs:
1. Add corstone1000_GCC_2_RegS_Debug_BL2_NSOFF_CS1K_TEST_FVP config into
   per-patch test config.
2. Cover Isolation Level 2 on CS1K in nightly and release test jobs.

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I3a7fceda5dd6df2e867d69365735396d8dd02fc9
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 99fa4ac..7b0c032 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -267,6 +267,9 @@
                     # CS300_FVP_GNUARM_2_RegBL2_RegS_RegNS_Release_BL2
                     ("arm/mps3/corstone300/fvp", "GCC_10_3", "2",
                      "RegBL2, RegS, RegNS", "OFF", "Release", True, "", ""),
+                    # corstone1000_GCC_2_RegS_Debug_BL2_NSOFF_CS1K_TEST_FVP
+                    ("arm/corstone1000", "GCC_10_3", "2",
+                     "RegS", "OFF", "Debug", True, "", "NSOFF, CS1K_TEST, FVP"),
                     # MUSCA_B1_GCC_1_RegBL2_RegS_RegNS_Minsizerel_BL2
                     ("arm/musca_b1", "GCC_10_3", "1",
                      "RegBL2, RegS, RegNS", "OFF", "Minsizerel", True, "", ""),
@@ -837,7 +840,7 @@
 config_corstone1000 = {"seed_params": {
                 "tfm_platform":     ["arm/corstone1000"],
                 "compiler":         ["GCC_10_3"],
-                "isolation_level":  ["1"],
+                "isolation_level":  ["1", "2"],
                 "test_regression":  ["RegS"],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug"],
@@ -1084,9 +1087,8 @@
                 }
 
 _builtin_configs = {
-                    # per-patch test groups
+                    # per-patch test group
                     "pp_test": config_pp_test,
-                    "pp_corstone1000": config_corstone1000,
 
                     # nightly test groups
                     "nightly_test": config_nightly_test,