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
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index b7f8993..2a0e252 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -143,21 +143,18 @@
# No PSA_ACK with regression
("*", "*", "*", "*", True, "IPC", "*", "*", "*", "*", "*", "*"),
("*", "*", "*", "*", True, "CRYPTO", "*", "*", "*", "*", "*", "*"),
- ("*", "*", "*", "*", True, "PROTECTED_STORAGE", "*", "*", "*", "*", "*", "*"),
("*", "*", "*", "*", True, "INITIAL_ATTESTATION", "*", "*", "*", "*", "*", "*"),
- ("*", "*", "*", "*", True, "INTERNAL_TRUSTED_STORAGE", "*", "*", "*", "*", "*", "*"),
+ ("*", "*", "*", "*", True, "STORAGE", "*", "*", "*", "*", "*", "*"),
# PSA_ACK requires NS
("*", "*", "*", "*", "*", "IPC", "*", "*", "*", False, "*", "*"),
("*", "*", "*", "*", "*", "CRYPTO", "*", "*", "*", False, "*", "*"),
- ("*", "*", "*", "*", "*", "PROTECTED_STORAGE", "*", "*", "*", False, "*", "*"),
("*", "*", "*", "*", "*", "INITIAL_ATTESTATION", "*", "*", "*", False, "*", "*"),
- ("*", "*", "*", "*", "*", "INTERNAL_TRUSTED_STORAGE", "*", "*", "*", False, "*", "*"),
+ ("*", "*", "*", "*", "*", "STORAGE", "*", "*", "*", False, "*", "*"),
# PSA_ACK does not support LVL3
("*", "*", "*", "3", "*", "IPC", "*", "*", "*", "*", "*", "*"),
("*", "*", "*", "3", "*", "CRYPTO", "*", "*", "*", "*", "*", "*"),
- ("*", "*", "*", "3", "*", "PROTECTED_STORAGE", "*", "*", "*", "*", "*", "*"),
("*", "*", "*", "3", "*", "INITIAL_ATTESTATION", "*", "*", "*", "*", "*", "*"),
- ("*", "*", "*", "3", "*", "INTERNAL_TRUSTED_STORAGE", "*", "*", "*", "*", "*", "*"),
+ ("*", "*", "*", "3", "*", "STORAGE", "*", "*", "*", "*", "*", "*"),
# Musca requires BL2
("arm/musca_b1/sse_200", "*", "*", "*", "*", "*", "*", "*", False, "*", "*", "*"),
("arm/musca_s1", "*", "*", "*", "*", "*", "*", "*", False, "*", "*", "*"),
@@ -175,9 +172,8 @@
("arm/musca_b1/secure_enclave", "*", "*", "*", True, "*", "*", "*", "*", "*", "*", "*"),
("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "IPC", "*", "*", "*", "*", "*", "*"),
("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "CRYPTO", "*", "*", "*", "*", "*", "*"),
- ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "PROTECTED_STORAGE", "*", "*", "*", "*", "*", "*"),
("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "INITIAL_ATTESTATION", "*", "*", "*", "*", "*", "*"),
- ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "INTERNAL_TRUSTED_STORAGE", "*", "*", "*", "*", "*", "*"),
+ ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "STORAGE", "*", "*", "*", "*", "*", "*"),
("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_small", "*"),
("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_medium", "*"),
("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "*", "*", "*", "*", True, "*", "*"),
@@ -258,9 +254,8 @@
"isolation_level": ["1", "2", "3"],
"test_regression": [False],
"test_psa_api": ["CRYPTO",
- "PROTECTED_STORAGE",
"INITIAL_ATTESTATION",
- "INTERNAL_TRUSTED_STORAGE"],
+ "STORAGE"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
"with_otp": ["off"],
"with_bl2": [True],
@@ -300,9 +295,8 @@
"isolation_level": ["1", "2", "3"],
"test_regression": [False],
"test_psa_api": ["CRYPTO",
- "PROTECTED_STORAGE",
"INITIAL_ATTESTATION",
- "INTERNAL_TRUSTED_STORAGE"],
+ "STORAGE"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
"with_otp": ["ENABLED"],
"with_bl2": [True],
@@ -627,9 +621,8 @@
"test_regression": [False],
"test_psa_api": ["IPC",
"CRYPTO",
- "PROTECTED_STORAGE",
"INITIAL_ATTESTATION",
- "INTERNAL_TRUSTED_STORAGE"],
+ "STORAGE"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
"with_otp": ["off"],
"with_bl2": [True],
@@ -744,9 +737,8 @@
"isolation_level": ["1", "2", "3"],
"test_regression": [False],
"test_psa_api": ["CRYPTO",
- "PROTECTED_STORAGE",
"INITIAL_ATTESTATION",
- "INTERNAL_TRUSTED_STORAGE"],
+ "STORAGE"],
"cmake_build_type": ["Debug", "Release"],
"with_otp": ["off"],
"with_bl2": [True],
@@ -929,9 +921,8 @@
"test_regression": [False],
"test_psa_api": ["IPC",
"CRYPTO",
- "PROTECTED_STORAGE",
"INITIAL_ATTESTATION",
- "INTERNAL_TRUSTED_STORAGE"],
+ "STORAGE"],
"cmake_build_type": ["Release"],
"with_otp": ["off"],
"with_bl2": [True],
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) {
diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index 094057c..bcda2dc 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -47,9 +47,8 @@
mapTestPsaApi = {"IPC": "FF",
"CRYPTO": "CRYPTO",
- "PROTECTED_STORAGE": "PS",
"INITIAL_ATTESTATION": "ATTEST",
- "INTERNAL_TRUSTED_STORAGE": "ITS"}
+ "STORAGE": "STORAGE"}
mapProfile = {"profile_small": "SMALL",
"profile_medium": "MEDIUM",