commit 39acb41b3a0f6e4f43b57218774f9d98f6a07329
author Xinyu Zhang <xinyu.zhang@arm.com> Fri Jul 09 20:35:19 2021 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Fri Jul 09 21:21:54 2021 +0800
tree 1c2c8bc7df5e3748a18d41a4b072c940f360be74
parent 3f9c3cf41c6f7a7d35a3c31f496e90bb78f86481

Build: Replace ITS and PS with STORAGE test suite

Test suites ITS & PS in PSA API could be replaced by STORAGE.
It could save resources and make the result table more readable.

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I2733a349d946b77ac03216d25617a671110ca54c

jenkins/ci.jpl

diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index 9f556e6..cde7ed5 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -28,8 +28,7 @@
           "False": ""]
 
 mapTestPsaApi = ["OFF":                      "",
-                 "INTERNAL_TRUSTED_STORAGE": "ITS",
-                 "PROTECTED_STORAGE":        "PS",
+                 "STORAGE":                  "STORAGE",
                  "CRYPTO":                   "Crypto",
                  "INITIAL_ATTESTATION":      "Attest",
                  "IPC":                      "FF"]
@@ -50,23 +49,19 @@
   ["True", "True", "False", "1", "True",  "OFF",                      "profile_small",  "RegressionProfileS"],
   ["True", "True", "True",  "2", "True",  "OFF",                      "profile_medium", "RegressionProfileM"],
   ["True", "True", "True",  "3", "True",  "OFF",                      "profile_large",  "RegressionProfileL"],
-  ["True", "True", "False", "1", "False", "INTERNAL_TRUSTED_STORAGE", "N.A",            "PsaApiTest (ITS)"],
-  ["True", "True", "False", "1", "False", "PROTECTED_STORAGE",        "N.A",            "PsaApiTest (PS)"],
+  ["True", "True", "False", "1", "False", "STORAGE",                  "N.A",            "PsaApiTest (STORAGE)"],
   ["True", "True", "False", "1", "False", "CRYPTO",                   "N.A",            "PsaApiTest (Crypto)"],
   ["True", "True", "False", "1", "False", "INITIAL_ATTESTATION",      "N.A",            "PsaApiTest (Attest)"],
   ["True", "True", "False", "1", "False", "IPC",                      "N.A",            "PsaApiTest (FF)"],
-  ["True", "True", "True",  "1", "False", "INTERNAL_TRUSTED_STORAGE", "N.A",            "PsaApiTestIPC (ITS)"],
-  ["True", "True", "True",  "1", "False", "PROTECTED_STORAGE",        "N.A",            "PsaApiTestIPC (PS)"],
+  ["True", "True", "True",  "1", "False", "STORAGE",                  "N.A",            "PsaApiTestIPC (STORAGE)"],
   ["True", "True", "True",  "1", "False", "CRYPTO",                   "N.A",            "PsaApiTestIPC (Crypto)"],
   ["True", "True", "True",  "1", "False", "INITIAL_ATTESTATION",      "N.A",            "PsaApiTestIPC (Attest)"],
   ["True", "True", "True",  "1", "False", "IPC",                      "N.A",            "PsaApiTestIPC (FF)"],
-  ["True", "True", "True",  "2", "False", "INTERNAL_TRUSTED_STORAGE", "N.A",            "PsaApiTestIPCTfmLevel2 (ITS)"],
-  ["True", "True", "True",  "2", "False", "PROTECTED_STORAGE",        "N.A",            "PsaApiTestIPCTfmLevel2 (PS)"],
+  ["True", "True", "True",  "2", "False", "STORAGE",                  "N.A",            "PsaApiTestIPCTfmLevel2 (STORAGE)"],
   ["True", "True", "True",  "2", "False", "CRYPTO",                   "N.A",            "PsaApiTestIPCTfmLevel2 (Crypto)"],
   ["True", "True", "True",  "2", "False", "INITIAL_ATTESTATION",      "N.A",            "PsaApiTestIPCTfmLevel2 (Attest)"],
   ["True", "True", "True",  "2", "False", "IPC",                      "N.A",            "PsaApiTestIPCTfmLevel2 (FF)"],
-  ["True", "True", "True",  "3", "False", "INTERNAL_TRUSTED_STORAGE", "N.A",            "PsaApiTestIPCTfmLevel3 (ITS)"],
-  ["True", "True", "True",  "3", "False", "PROTECTED_STORAGE",        "N.A",            "PsaApiTestIPCTfmLevel3 (PS)"],
+  ["True", "True", "True",  "3", "False", "STORAGE",                  "N.A",            "PsaApiTestIPCTfmLevel3 (STORAGE)"],
   ["True", "True", "True",  "3", "False", "CRYPTO",                   "N.A",            "PsaApiTestIPCTfmLevel3 (Crypto)"],
   ["True", "True", "True",  "3", "False", "INITIAL_ATTESTATION",      "N.A",            "PsaApiTestIPCTfmLevel3 (Attest)"],
   ["True", "True", "True",  "3", "False", "IPC",                      "N.A",            "PsaApiTestIPCTfmLevel3 (FF)"],
@@ -82,15 +77,12 @@
         "PsaApiTestIPCTfmLevel2 (Attest)",
         "PsaApiTest (Crypto)", "PsaApiTestIPC (Crypto)",
         "PsaApiTestIPCTfmLevel2 (Crypto)",
-        "PsaApiTest (PS)", "PsaApiTestIPC (PS)",
-        "PsaApiTestIPCTfmLevel2 (PS)",
-        "PsaApiTest (ITS)", "PsaApiTestIPC (ITS)",
-        "PsaApiTestIPCTfmLevel2 (ITS)",
+        "PsaApiTest (STORAGE)", "PsaApiTestIPC (STORAGE)",
+        "PsaApiTestIPCTfmLevel2 (STORAGE)",
         "PsaApiTestIPC (FF)",
         "PsaApiTestIPCTfmLevel2 (FF)",
-        "PsaApiTestIPCTfmLevel3 (ITS)", "PsaApiTestIPCTfmLevel3 (PS)",
-        "PsaApiTestIPCTfmLevel3 (Crypto)", "PsaApiTestIPCTfmLevel3 (Attest)",
-        "PsaApiTestIPCTfmLevel3 (FF)"]
+        "PsaApiTestIPCTfmLevel3 (STORAGE)", "PsaApiTestIPCTfmLevel3 (Crypto)",
+        "PsaApiTestIPCTfmLevel3 (Attest)", "PsaApiTestIPCTfmLevel3 (FF)"]
 
 @NonCPS
 def generateLavaParam(build_params) {