diff options
author | Tom Hughes <tomhughes@chromium.org> | 2022-09-21 14:10:01 -0700 |
---|---|---|
committer | Tom Hughes <tomhughes@chromium.org> | 2022-09-22 12:49:33 -0700 |
commit | 2bcf863b492fe7ed8105c853814dba6ed32ba719 (patch) | |
tree | fcf6ce5810f9ff9e3c8cce434812dd75492269ed /util/zephyr_to_resultdb.py | |
parent | e5fb0b9ba488614b5684e640530f00821ab7b943 (diff) | |
parent | 28712dae9d7ed1e694f7622cc083afa71090d4d5 (diff) | |
download | chrome-ec-firmware-fpmcu-bloonchipper-release.tar.gz |
Merge remote-tracking branch cros/main into firmware-fpmcu-bloonchipper-releasefirmware-fpmcu-bloonchipper-release
Generated by: ./util/update_release_branch.py --board bloonchipper
--relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-
fpmcu-bloonchipper-release
Relevant changes:
git log --oneline e5fb0b9ba4..28712dae9d -- board/hatch_fp
board/bloonchipper common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh
ded9307b79 util/getversion.sh: Fix version when not in a git repo
956055e692 board: change Google USB vendor info
71b2ef709d Update license boilerplate text in source code files
33e11afda0 Revert "fpsensor: Build fpsensor source file with C++"
c8d0360723 fpsensor: Build fpsensor source file with C++
bc113abd53 fpsensor: Fix g++ compiler error
150a58a0dc fpsensor: Fix fp_set_sensor_mode return type
b33b5ce85b fpsensor: Remove nested designators for C++ compatibility
2e864b2539 tree-wide: const-ify argv for console commands
56d8b360f9 test: Add test for get ikm failure when seed not set
3a3d6c3690 test: Add test for fpsensor trivial key failure
233e6bbd08 fpsensor_crypto: Abstract calls to hmac_SHA256
0a041b285b docs/fingerprint: Typo correction
c03fab67e2 docs/fingerprint: Fix the path of fputils.py
0b5d4baf5a util/getversion.sh: Fix empty file list handling
6e128fe760 FPMCU dev board environment with Satlab
3eb29b6aa5 builtin: Move ssize_t to sys/types.h
345d62ebd1 docs/fingerprint: Update power numbers for latest dartmonkey release
c25ffdb316 common: Conditionally support printf %l and %i modifiers
9a3c514b45 test: Add a test to check if the debugger is connected
54e603413f Move standard library tests to their own file
43fa6b4bf8 docs/fingerprint: Update power numbers for latest bloonchipper release
25536f9a84 driver/fingerprint/fpc/bep/fpc_sensor_spi.c: Format with clang-format
4face99efd driver/fingerprint/fpc/libfp/fpc_sensor_pal.h: Format with clang-format
738de2b575 trng: Rename rand to trng_rand
14b8270edd docs/fingerprint: Update dragonclaw power numbers
0b268f93d1 driver/fingerprint/fpc/libfp/fpc_private.c: Format with clang-format
f80da163f2 driver/fingerprint/fpc/libfp/fpc_private.h: Format with clang-format
5e9c85c9b1 driver/fingerprint/fpc/libfp/fpc_sensor_pal.c: Format with clang-format
c1f9dd3cf8 driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h: Format with clang-format
eb1e1bed8d driver/fingerprint/fpc/libfp/fpc1145_private.h: Format with clang-format
6e7b611821 driver/fingerprint/fpc/bep/fpc_bio_algorithm.h: Format with clang-format
e0589cd5e2 driver/fingerprint/fpc/bep/fpc1035_private.h: Format with clang-format
7905e556a0 common/fpsensor/fpsensor_crypto.c: Format with clang-format
21289d170c driver/fingerprint/fpc/bep/fpc1025_private.h: Format with clang-format
98a20f937e common/fpsensor/fpsensor_state.c: Format with clang-format
a2d255d8af common/fpsensor/fpsensor.c: Format with clang-format
73055eeb3f driver/fingerprint/fpc/bep/fpc_private.c: Format with clang-format
0f7b5cb509 common/fpsensor/fpsensor_private.h: Format with clang-format
1ceade6e65 driver/fingerprint/fpc/bep/fpc_private.h: Format with clang-format
dc3e9008b8 board/hatch_fp/board.h: Format with clang-format
dca9d74321 Revert "trng: Rename rand to trng_rand"
a6b0b3554f trng: Rename rand to trng_rand
28d0b75b70 third_party/boringssl: Remove unused header
BRANCH=None
BUG=b:246424843 b:234181908 b:244781166 b:234181908 b:244387210
BUG=b:242720240 chromium:1098010 b:180945056 b:236025198 b:234181908
BUG=b:234181908 b:237344361 b:131913998 b:236386294 b:234143158
BUG=b:234781655 b:215613183 b:242720910
TEST=`make -j buildall`
TEST=./test/run_device_tests.py --board bloonchipper
Test "aes": PASSED
Test "cec": PASSED
Test "cortexm_fpu": PASSED
Test "crc": PASSED
Test "flash_physical": PASSED
Test "flash_write_protect": PASSED
Test "fpsensor_hw": PASSED
Test "fpsensor_spi_ro": PASSED
Test "fpsensor_spi_rw": PASSED
Test "fpsensor_uart_ro": PASSED
Test "fpsensor_uart_rw": PASSED
Test "mpu_ro": PASSED
Test "mpu_rw": PASSED
Test "mutex": PASSED
Test "pingpong": PASSED
Test "printf": PASSED
Test "queue": PASSED
Test "rollback_region0": PASSED
Test "rollback_region1": PASSED
Test "rollback_entropy": PASSED
Test "rtc": PASSED
Test "sha256": PASSED
Test "sha256_unrolled": PASSED
Test "static_if": PASSED
Test "stdlib": PASSED
Test "system_is_locked_wp_on": PASSED
Test "system_is_locked_wp_off": PASSED
Test "timer_dos": PASSED
Test "utils": PASSED
Test "utils_str": PASSED
Test "stm32f_rtc": PASSED
Test "panic_data_bloonchipper_v2.0.4277": PASSED
Test "panic_data_bloonchipper_v2.0.5938": PASSED
Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I264ad0ffe7afcd507a1e483c6e934a9c4fea47c3
Diffstat (limited to 'util/zephyr_to_resultdb.py')
-rwxr-xr-x | util/zephyr_to_resultdb.py | 173 |
1 files changed, 173 insertions, 0 deletions
diff --git a/util/zephyr_to_resultdb.py b/util/zephyr_to_resultdb.py new file mode 100755 index 0000000000..48bfe151e4 --- /dev/null +++ b/util/zephyr_to_resultdb.py @@ -0,0 +1,173 @@ +#!/usr/bin/env python3 +# Copyright 2022 The ChromiumOS Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +""" Upload twister results to ResultDB + + Usage: + $ rdb stream -new -realm chromium:public -- ./util/zephyr_to_resultdb.py + --results=twister-out/twister.json --upload=True +""" + +import argparse +import base64 +import json +import os + +import requests # pylint: disable=import-error + + +def translate_status(status): + """Translates ZTEST status to ResultDB status""" + ret_status = "SKIP" + + if status == "passed": + ret_status = "PASS" + elif status == "failed": + ret_status = "FAIL" + elif status in ["skipped", "filtered"]: + ret_status = "SKIP" + + return ret_status + + +def translate_expected(status): + """Translates ZTEST status to ResultDB expected""" + flag = False + + if status in ["passed", "filtered"]: + flag = True + + return flag + + +def translate_duration(testcase): + """Translates ZTEST execution_time to ResultDB duration""" + time = testcase.get("execution_time") + if not time: + return None + + return f"{time}ms" + + +def testcase_summary(testcase): + """Translates ZTEST testcase to ResultDB summaryHtml""" + html = "<p>None</p>" + + if ( + "log" in testcase + or "reason" in testcase + or translate_status(testcase["status"]) == "SKIP" + ): + html = ( + '<p><text-artifact artifact-id="artifact-content-in-request"></p>' + ) + + return html + + +def testcase_artifact(testcase): + """Translates ZTEST testcase to ResultDB artifact""" + artifact = "Unknown" + + if "log" in testcase and testcase["log"]: + artifact = testcase["log"] + elif "reason" in testcase and testcase["reason"]: + artifact = testcase["reason"] + elif testcase["status"] == "filtered": + artifact = "filtered" + elif testcase["status"] == "skipped": + artifact = "skipped" + + return base64.b64encode(artifact.encode()) + + +def testcase_to_result(testsuite, testcase): + """Translates ZTEST testcase to ResultDB format""" + result = { + "testId": testcase["identifier"], + "status": translate_status(testcase["status"]), + "expected": translate_expected(testcase["status"]), + "summaryHtml": testcase_summary(testcase), + "artifacts": { + "artifact-content-in-request": { + "contents": testcase_artifact(testcase), + } + }, + # TODO(b/239952573) Add all test configs as tags + "tags": [ + {"key": "category", "value": "ChromeOS/EC"}, + {"key": "platform", "value": testsuite["platform"]}, + ], + "duration": translate_duration(testcase), + "testMetadata": {"name": testcase["identifier"]}, + } + + return result + + +def json_to_resultdb(result_file): + """Translates Twister json test report to ResultDB format""" + with open(result_file) as file: + data = json.load(file) + results = [] + + for testsuite in data["testsuites"]: + for testcase in testsuite["testcases"]: + if testcase["status"]: + results.append(testcase_to_result(testsuite, testcase)) + + file.close() + + return results + + +class BytesEncoder(json.JSONEncoder): + """Encoder for ResultDB format""" + + def default(self, obj): + if isinstance(obj, bytes): + return obj.decode("utf-8") + return json.JSONEncoder.default(self, obj) + + +def upload_results(results): + """Upload results to ResultDB""" + with open(os.environ["LUCI_CONTEXT"]) as file: + sink = json.load(file)["result_sink"] + + # Uploads all test results at once. + res = requests.post( + url="http://%s/prpc/luci.resultsink.v1.Sink/ReportTestResults" + % sink["address"], + headers={ + "Content-Type": "application/json", + "Accept": "application/json", + "Authorization": "ResultSink %s" % sink["auth_token"], + }, + data=json.dumps({"testResults": results}, cls=BytesEncoder), + ) + res.raise_for_status() + + +def main(): + """main""" + # Set up argument parser. + parser = argparse.ArgumentParser( + description=("Upload Zephyr Twister test results to ResultDB") + ) + parser.add_argument("--results") + parser.add_argument("--upload", default=False) + args = parser.parse_args() + + if args.results: + print("Converting:", args.results) + rdb_results = json_to_resultdb(args.results) + if args.upload: + upload_results(rdb_results) + else: + raise Exception("Missing test result file for conversion") + + +if __name__ == "__main__": + main() |