diff --git a/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic20/snap/snapcraft.yaml b/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic20/snap/snapcraft.yaml index 2666df230b..5dcb813beb 100644 --- a/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic20/snap/snapcraft.yaml +++ b/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic20/snap/snapcraft.yaml @@ -74,6 +74,29 @@ parts: PART_SRC=${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-ce-oem/src gcc ${PART_SRC}/src/input-pcspkr.c -o ${PART_SRC}/src/beep cp -v ${PART_SRC}/src/beep ${SNAPCRAFT_PART_INSTALL}/usr/bin/ + xtest: + plugin: dump + source: https://github.com/OP-TEE/optee_test.git + source-type: git + build-snaps: + - checkbox20 + build-packages: + - jq + build-environment: + - PART_DEST: ${SNAPCRAFT_PART_INSTALL}/providers/checkbox-provider-ce-oem/data/ + - PROVIDER_SRC: ${SNAPCRAFT_PROJECT_DIR}/../../checkbox-provider-ce-oem + - PYTHONPATH: /snap/checkbox20/current/lib/python3.8/site-packages/ + override-pull: | + snapcraftctl pull + cp ${PROVIDER_SRC}/data/xtest_supported_version.json . + cp ${PROVIDER_SRC}/bin/optee_helper.py . + cp ${PROVIDER_SRC}/bin/look_up_xtest.py . + override-build: | + for ver in `cat xtest_supported_version.json | jq -r .xtest_suite_tag[]`; do + git checkout $ver + python3 optee_helper.py parse_xtest_src $ver + done + cp -v optee-test-*.json ${PART_DEST} spidev-test: plugin: make source: https://github.com/torvalds/linux.git diff --git a/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic22/snap/snapcraft.yaml b/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic22/snap/snapcraft.yaml index 91e83e557f..585f77248f 100644 --- a/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic22/snap/snapcraft.yaml +++ b/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic22/snap/snapcraft.yaml @@ -75,6 +75,29 @@ parts: PART_SRC=${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-ce-oem/src gcc ${PART_SRC}/src/input-pcspkr.c -o ${PART_SRC}/src/beep cp -v ${PART_SRC}/src/beep ${SNAPCRAFT_PART_INSTALL}/usr/bin/ + xtest: + plugin: dump + source: https://github.com/OP-TEE/optee_test.git + source-type: git + build-snaps: + - checkbox22 + build-packages: + - jq + build-environment: + - PART_DEST: ${SNAPCRAFT_PART_INSTALL}/providers/checkbox-provider-ce-oem/data/ + - PROVIDER_SRC: ${SNAPCRAFT_PROJECT_DIR}/../../checkbox-provider-ce-oem + - PYTHONPATH: /snap/checkbox22/current/lib/python3.10/site-packages/ + override-pull: | + snapcraftctl pull + cp ${PROVIDER_SRC}/data/xtest_supported_version.json . + cp ${PROVIDER_SRC}/bin/optee_helper.py . + cp ${PROVIDER_SRC}/bin/look_up_xtest.py . + override-build: | + for ver in `cat xtest_supported_version.json | jq -r .xtest_suite_tag[]`; do + git checkout $ver + python3 optee_helper.py parse_xtest_src $ver + done + cp -v optee-test-*.json ${PART_DEST} spidev-test: plugin: make source: https://github.com/torvalds/linux.git diff --git a/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic24/snap/snapcraft.yaml b/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic24/snap/snapcraft.yaml index b94f703034..3191c04a33 100644 --- a/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic24/snap/snapcraft.yaml +++ b/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic24/snap/snapcraft.yaml @@ -75,6 +75,29 @@ parts: PART_SRC=${CRAFT_PROJECT_DIR}/parts/checkbox-provider-ce-oem/src gcc ${PART_SRC}/src/input-pcspkr.c -o ${PART_SRC}/src/beep cp -v ${PART_SRC}/src/beep ${CRAFT_PART_INSTALL}/usr/bin/ + xtest: + plugin: dump + source: https://github.com/OP-TEE/optee_test.git + source-type: git + build-snaps: + - checkbox24 + build-packages: + - jq + build-environment: + - PART_DEST: ${CRAFT_PART_INSTALL}/providers/checkbox-provider-ce-oem/data/ + - PROVIDER_SRC: ${CRAFT_PROJECT_DIR}/../../checkbox-provider-ce-oem + - PYTHONPATH: /snap/checkbox24/current/lib/python3.12/site-packages/ + override-pull: | + snapcraftctl pull + cp ${PROVIDER_SRC}/data/xtest_supported_version.json . + cp ${PROVIDER_SRC}/bin/optee_helper.py . + cp ${PROVIDER_SRC}/bin/look_up_xtest.py . + override-build: | + for ver in `cat xtest_supported_version.json | jq -r .xtest_suite_tag[]`; do + git checkout $ver + python3 optee_helper.py parse_xtest_src $ver + done + cp -v optee-test-*.json ${PART_DEST} spidev-test: plugin: make source: https://github.com/torvalds/linux.git diff --git a/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc20/snap/snapcraft.yaml b/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc20/snap/snapcraft.yaml index e3b80ea5ac..d2b88d1dfb 100644 --- a/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc20/snap/snapcraft.yaml +++ b/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc20/snap/snapcraft.yaml @@ -111,6 +111,29 @@ parts: PART_SRC=${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-ce-oem/src gcc ${PART_SRC}/src/input-pcspkr.c -o ${PART_SRC}/src/beep cp -v ${PART_SRC}/src/beep ${SNAPCRAFT_PART_INSTALL}/usr/bin/ + xtest: + plugin: dump + source: https://github.com/OP-TEE/optee_test.git + source-type: git + build-snaps: + - checkbox20 + build-packages: + - jq + build-environment: + - PART_DEST: ${SNAPCRAFT_PART_INSTALL}/providers/checkbox-provider-ce-oem/data/ + - PROVIDER_SRC: ${SNAPCRAFT_PROJECT_DIR}/../../checkbox-provider-ce-oem + - PYTHONPATH: /snap/checkbox20/current/lib/python3.8/site-packages/ + override-pull: | + snapcraftctl pull + cp ${PROVIDER_SRC}/data/xtest_supported_version.json . + cp ${PROVIDER_SRC}/bin/optee_helper.py . + cp ${PROVIDER_SRC}/bin/look_up_xtest.py . + override-build: | + for ver in `cat xtest_supported_version.json | jq -r .xtest_suite_tag[]`; do + git checkout $ver + python3 optee_helper.py parse_xtest_src $ver + done + cp -v optee-test-*.json ${PART_DEST} spidev-test: plugin: make source: https://github.com/torvalds/linux.git diff --git a/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc22/snap/snapcraft.yaml b/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc22/snap/snapcraft.yaml index 2338bf1de4..c7bdff54c4 100644 --- a/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc22/snap/snapcraft.yaml +++ b/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc22/snap/snapcraft.yaml @@ -112,6 +112,29 @@ parts: PART_SRC=${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-ce-oem/src gcc ${PART_SRC}/src/input-pcspkr.c -o ${PART_SRC}/src/beep cp -v ${PART_SRC}/src/beep ${SNAPCRAFT_PART_INSTALL}/usr/bin/ + xtest: + plugin: dump + source: https://github.com/OP-TEE/optee_test.git + source-type: git + build-snaps: + - checkbox22 + build-packages: + - jq + build-environment: + - PART_DEST: ${SNAPCRAFT_PART_INSTALL}/providers/checkbox-provider-ce-oem/data/ + - PROVIDER_SRC: ${SNAPCRAFT_PROJECT_DIR}/../../checkbox-provider-ce-oem + - PYTHONPATH: /snap/checkbox22/current/lib/python3.10/site-packages/ + override-pull: | + snapcraftctl pull + cp ${PROVIDER_SRC}/data/xtest_supported_version.json . + cp ${PROVIDER_SRC}/bin/optee_helper.py . + cp ${PROVIDER_SRC}/bin/look_up_xtest.py . + override-build: | + for ver in `cat xtest_supported_version.json | jq -r .xtest_suite_tag[]`; do + git checkout $ver + python3 optee_helper.py parse_xtest_src $ver + done + cp -v optee-test-*.json ${PART_DEST} spidev-test: plugin: make source: https://github.com/torvalds/linux.git diff --git a/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc24/snap/snapcraft.yaml b/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc24/snap/snapcraft.yaml index 894335b0ff..315df8fbc9 100644 --- a/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc24/snap/snapcraft.yaml +++ b/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc24/snap/snapcraft.yaml @@ -112,6 +112,29 @@ parts: PART_SRC=${CRAFT_PROJECT_DIR}/parts/checkbox-provider-ce-oem/src gcc ${PART_SRC}/src/input-pcspkr.c -o ${PART_SRC}/src/beep cp -v ${PART_SRC}/src/beep ${CRAFT_PART_INSTALL}/usr/bin/ + xtest: + plugin: dump + source: https://github.com/OP-TEE/optee_test.git + source-type: git + build-snaps: + - checkbox24 + build-packages: + - jq + build-environment: + - PART_DEST: ${CRAFT_PART_INSTALL}/providers/checkbox-provider-ce-oem/data/ + - PROVIDER_SRC: ${CRAFT_PROJECT_DIR}/../../checkbox-provider-ce-oem + - PYTHONPATH: /snap/checkbox24/current/lib/python3.12/site-packages/ + override-pull: | + snapcraftctl pull + cp ${PROVIDER_SRC}/data/xtest_supported_version.json . + cp ${PROVIDER_SRC}/bin/optee_helper.py . + cp ${PROVIDER_SRC}/bin/look_up_xtest.py . + override-build: | + for ver in `cat xtest_supported_version.json | jq -r .xtest_suite_tag[]`; do + git checkout $ver + python3 optee_helper.py parse_xtest_src $ver + done + cp -v optee-test-*.json ${PART_DEST} spidev-test: plugin: make source: https://github.com/torvalds/linux.git diff --git a/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/bin/optee_helper.py b/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/bin/optee_helper.py new file mode 100755 index 0000000000..22fdbd17ae --- /dev/null +++ b/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/bin/optee_helper.py @@ -0,0 +1,207 @@ +#!/usr/bin/env python3 +import argparse +import glob +import json +import os +import re +import shlex +import subprocess + +from look_up_xtest import look_up_app +from pathlib import Path +from systemd import journal +from xtest_install_ta import find_ta_path, install_ta + + +TEST_FILE_PREFIX = "optee-test-" + + +def _run_command(cmd, **kwargs): + """Helper function to run commands and print out the command and output""" + print("Running command: {}".format(cmd), flush=True) + try: + return subprocess.run(shlex.split(cmd), **kwargs) + except subprocess.CalledProcessError as e: + print( + "Command failed with return code {}".format(e.returncode), + flush=True, + ) + print("Error output: {}".format(e.stderr), flush=True) + raise e + except Exception as e: + print( + "Unexpected error running command: {}".format(str(e)), flush=True + ) + raise e + + +def launch_xtest(test_suite, test_id): + test_utility = look_up_app("xtest", os.environ.get("XTEST")) + + print("Looking for PID of tee-supplicant..", flush=True) + _run_command("pgrep tee-supplicant", check=True) + + optee_fw = _lookup_optee_version() + + if optee_fw is None: + print( + "OPTEE firmware version unavailable in journal log" + ", check OPTEE OS is activate", + flush=True, + ) + return 2 + elif optee_fw < "4.0": + ta_path = find_ta_path() + install_ta(test_utility, ta_path) + + ret = _run_command( + "{} -t {} {}".format(test_utility, test_suite, test_id), check=False + ) + return ret.returncode + + +def parse_test_cases(): + test_cases = [] + pattern = r"ADBG_CASE_DEFINE\((.*?), (.*?), (.*?),\s+\"(.*?)\"\);" + + for file in glob.glob("**/*.c", recursive=True): + file_obj = Path(file) + matches = re.findall(pattern, file_obj.read_text(), re.DOTALL) + for match in matches: + suite, test_num, test_name, test_desc = match + test_desc = test_desc.replace(": ", " - ") + + if suite.strip() not in ["ffa_spmc", "gp"]: + test_desc = test_desc.strip() + test_cases.append( + { + "suite": suite.strip(), + "test_id": test_num.strip(), + "test_name": test_name.strip(), + "test_description": test_desc, + } + ) + + return test_cases + + +def parse_xtest_src(version): + output_file = "{}{}.json".format(TEST_FILE_PREFIX, version) + test_cases = parse_test_cases() + with open(output_file, "w") as fp: + json.dump(test_cases, fp, indent=4) + + +def _lookup_optee_version(): + j_reader = journal.Reader() + j_reader.this_boot() + for entry in j_reader: + match = re.search( + r"optee: (version|revision) (\d+.\d+)", entry["MESSAGE"] + ) + if match: + return match.group(2) + return None + + +def check_version(expected_ver): + + optee_version = _lookup_optee_version() or "unknown" + print("optee_firmware: {}".format(optee_version)) + print("expected version: {}".format(expected_ver)) + if not expected_ver or optee_version != expected_ver: + raise SystemExit("Error: OPTEE firmware version is not expected") + else: + print("Passed: OPTEE firmware version is expected") + + +def parse_json_file(filepath, filter_pkcs11=False): + + if not filepath: + default_provider_path = ( + "/snap/checkbox-ce-oem/current/providers" + "/checkbox-provider-ce-oem/data/" + ) + fw_ver = _lookup_optee_version() + if not fw_ver: + print("error: failed to retrieve the version of optee") + return + # append 0 when the version is not fit + if len(fw_ver.split(".")) == 2: + filepath = "{}{}{}.0.json".format( + default_provider_path, TEST_FILE_PREFIX, fw_ver + ) + else: + filepath = "{}{}{}.json".format( + default_provider_path, TEST_FILE_PREFIX, fw_ver + ) + + fp = Path(filepath) + if not fp.exists(): + print("error: {} is not available".format(filepath)) + else: + for test in json.loads(fp.read_text()): + if (filter_pkcs11 and test["suite"] == "pkcs11") or ( + not filter_pkcs11 and test["suite"] != "pkcs11" + ): + print_test_info(test) + + +def print_test_info(test): + print("suite: {}".format(test["suite"])) + print("test_id: {}".format(test["test_id"])) + print("test_name: {}".format(test["test_name"])) + print("description: {}".format(test["test_description"])) + print() + + +def register_arguments(): + parser = argparse.ArgumentParser(description="OPTEE helper scripts") + sub_parsers = parser.add_subparsers(dest="action", required=True) + + gen_tests_parser = sub_parsers.add_parser( + "generate", description="Parse an OPTEE JSON file" + ) + gen_tests_parser.add_argument( + "-p", + "--pkcs11", + help="To filter out PKCS11 for the suite." "field in JSON.", + action="store_true", + ) + + parse_src_parser = sub_parsers.add_parser( + "parse_xtest_src", + description="Parse xtest source code and dump a JSON file", + ) + parse_src_parser.add_argument("file_suffix") + + check_parser = sub_parsers.add_parser( + "check_firmware_version", description="check OPTEE firmware" + ) + check_parser.add_argument( + "expected_version", help="OPTEE firmware version" + ) + + test_parser = sub_parsers.add_parser( + "xtest", description="perform xtest case" + ) + test_parser.add_argument("test_suite", type=str) + test_parser.add_argument("test_id", type=str) + + return parser.parse_args() + + +def main(): + args = register_arguments() + if args.action == "generate": + parse_json_file(os.environ.get("OPTEE_CASES"), args.pkcs11) + elif args.action == "check_firmware_version": + check_version(args.expected_version) + elif args.action == "parse_xtest_src": + parse_xtest_src(args.file_suffix) + elif args.action == "xtest": + raise SystemExit(launch_xtest(args.test_suite, args.test_id)) + + +if __name__ == "__main__": + main() diff --git a/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/bin/parse_optee_test.py b/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/bin/parse_optee_test.py deleted file mode 100755 index af9c85ed15..0000000000 --- a/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/bin/parse_optee_test.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env python3 - -import json -import argparse -from look_up_xtest import look_up_app -import os - - -def parse_json_file(filepath, filter=False, xtest=None): - with open(filepath, "r") as file: - data = json.load(file) - for test in data: - if check_suite(test["suite"], filter): - print_test_info(test, xtest) - - -def check_suite(suite, filter): - if filter: - return suite == "pkcs11" - else: - return suite != "pkcs11" - - -def print_test_info(test, xtest): - print("suite: {}".format(test["suite"])) - print("test_id: {}".format(test["test_id"])) - print("test_name: {}".format(test["test_name"])) - print("description: {}".format(test["test_description"])) - print("tool: {}\n".format(xtest)) - - -def main(): - parser = argparse.ArgumentParser(description="Parse a JSON file.") - parser.add_argument("filepath", help="The path of the file to parse.") - parser.add_argument( - "-p", - "--pkcs11", - help="To filter out PKCS11 for the suite." "field in JSON.", - action="store_true", - ) - args = parser.parse_args() - try: - xtest = look_up_app("xtest", os.environ.get("XTEST")) - except SystemError: - xtest = None - parse_json_file(args.filepath, args.pkcs11, xtest) - - -if __name__ == "__main__": - main() diff --git a/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/data/xtest_supported_version.json b/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/data/xtest_supported_version.json new file mode 100644 index 0000000000..86786010a7 --- /dev/null +++ b/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/data/xtest_supported_version.json @@ -0,0 +1,10 @@ +{ + "xtest_suite_tag": [ + "3.19.0", + "4.1.0", + "4.2.0", + "4.3.0", + "4.4.0", + "4.5.0" + ] +} diff --git a/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/optee/jobs.pxu b/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/optee/jobs.pxu index 57bd3bf420..20991c48da 100644 --- a/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/optee/jobs.pxu +++ b/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/optee/jobs.pxu @@ -19,50 +19,62 @@ command: exit 1 fi -id: ce-oem-optee/ta-install +id: ce-oem-optee/check-tee-supplicant category_id: optee -_summary: Install Trusted Applications for xtest +_summary: Validate OPTEE tee-supplicant is activate plugin: shell user: root -estimated_duration: 20.0 -environ: XTEST +estimated_duration: 5.0 depends: ce-oem-optee/device-node command: if pgrep -x "tee-supplicant" > /dev/null; then - xtest_install_ta.py + echo "Passed: tee-supplicant is activated." else echo "Error: tee-supplicant not found!" exit 1 fi +id: ce-oem-optee/ta-install +category_id: optee +_summary: Install Trusted Applications for xtest +plugin: shell +user: root +estimated_duration: 20.0 +environ: XTEST +depends: + ce-oem-optee/device-node + ce-oem-optee/check-tee-supplicant +command: + xtest_install_ta.py + +id: ce-oem-optee/check-firmware-version +estimated_duration: 1 +plugin: shell +user: root +category_id: optee +environ: OPTEE_FW_VERSION +command: + optee_helper.py check_firmware_version "${OPTEE_FW_VERSION:-NotDefined}" +_summary: Check the OP-TEE firmware version + id: ce-oem-optee-test-list estimated_duration: 1 plugin: resource user: root -environ: OPTEE_CASES XTEST +category_id: optee +environ: OPTEE_CASES command: - filepath="" - if [[ -n "$OPTEE_CASES" ]]; then - filepath="$OPTEE_CASES" - else - filepath="$PLAINBOX_PROVIDER_DATA/optee-test-319.json" - fi - parse_optee_test.py "$filepath" + optee_helper.py generate _summary: Collect the test cases support by OP-TEE test(xtest) id: ce-oem-optee-test-list-pkcs11 estimated_duration: 1 plugin: resource user: root -environ: OPTEE_CASES XTEST +category_id: optee +environ: OPTEE_CASES command: - filepath="" - if [[ -n "$OPTEE_CASES" ]]; then - filepath="$OPTEE_CASES" - else - filepath="$PLAINBOX_PROVIDER_DATA/optee-test-319.json" - fi - parse_optee_test.py "$filepath" -p + optee_helper.py generate -p _summary: Collect the test cases related with PKCS11 support by OP-TEE test(xtest) unit: template @@ -70,45 +82,33 @@ template-resource: ce-oem-optee-test-list template-unit: job template-engine: jinja2 id: ce-oem-optee/xtest-{{ suite }}-{{ test_name }} -_summary: - OP-TEE test by using xtest to test suite {{ suite }} {{ description }} +_summary: {{ suite }} test - {{ description }} plugin: shell user: root category_id: optee +environ: XTEST estimated_duration: 30 flags: also-after-suspend requires: manifest.has_optee == 'True' imports: from com.canonical.plainbox import manifest -depends: ce-oem-optee/ta-install +depends: ce-oem-optee/device-node command: - if pgrep -x "tee-supplicant" > /dev/null; then - echo "Perform {{ description }}" - {{ tool }} -t {{ suite }} {{ test_id }} - else - echo "Error: Not found tee-supplicant!" - exit 1 - fi + optee_helper.py xtest {{ suite }} {{ test_id }} unit: template template-resource: ce-oem-optee-test-list-pkcs11 template-unit: job template-engine: jinja2 id: ce-oem-optee/xtest-pkcs11-{{ test_name }} -_summary: - OP-TEE test by using xtest to test PKCS11 related {{ description }} +_summary: {{ suite }} test - {{ description }} plugin: shell user: root category_id: optee +environ: XTEST estimated_duration: 30 requires: manifest.has_optee == 'True' imports: from com.canonical.plainbox import manifest depends: ce-oem-optee/device-node flags: also-after-suspend command: - if pgrep -x "tee-supplicant" > /dev/null; then - echo "Perform {{ description }}" - {{ tool }} -t {{ suite }} {{ test_id }} - else - echo "Error: Not found tee-supplicant!" - exit 1 - fi + optee_helper.py xtest {{ suite }} {{ test_id }} diff --git a/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/optee/test-plan.pxu b/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/optee/test-plan.pxu index 3a77108c65..a32afe8116 100644 --- a/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/optee/test-plan.pxu +++ b/contrib/checkbox-ce-oem/checkbox-provider-ce-oem/units/optee/test-plan.pxu @@ -14,8 +14,8 @@ bootstrap_include: ce-oem-optee-test-list ce-oem-optee-test-list-pkcs11 include: + ce-oem-optee/check-firmware-version ce-oem-optee/device-node - ce-oem-optee/ta-install ce-oem-optee/xtest-regression.* ce-oem-optee/xtest-benchmark.* ce-oem-optee/xtest-pkcs11.*