From c7f360f20d848f9e2b607885a280084290732566 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 6 May 2025 08:04:12 -0600 Subject: [PATCH] Gitlab: Rework sjg-lab calling test.py to be closer to test.py stage There are a few differences between how the test.py stage invokes test.py and how the sjg-lab stage invokes test.py. As a start of making both the code and the output and artifacts similar, this updates the sjg-lab stage with the following: - Pass "-ra" so that we get the summary information in the job - Make use of TEST_PY_EXTRA for passing "--capture=tee-sys" - Re-order some of the arguments to be the same order when possible. And most importantly: - Create and save as an artifact the junitxml output. The last part here is the kind of test result information that in the future we should determine how to archive for future reference. Reviewed-by: Simon Glass Signed-off-by: Tom Rini --- .gitlab-ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49f3c588cfc..d2faa107443 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -594,8 +594,10 @@ coreboot test.py: - export strategy="-s uboot -e off" - export USE_LABGRID_SJG=1 # export verbose="-v" - - ${SRC}/test/py/test.py --role ${ROLE} --build-dir "${OUT}" - --capture=tee-sys -k "not bootstd ${TEST_PY_TEST_SPEC}" || ret=$? + - ${SRC}/test/py/test.py -ra --role ${ROLE} ${TEST_PY_EXTRA:-"--capture=tee-sys"} + --build-dir "${OUT}" + ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"} + --junitxml=${OUT}/results.xml || ret=$? - U_BOOT_BOARD_IDENTITY="${ROLE}" u-boot-test-release || true - if [[ $ret -ne 0 ]]; then exit $ret; @@ -605,6 +607,9 @@ coreboot test.py: paths: - "build/${BOARD}/test-log.html" - "build/${BOARD}/multiplexed_log.css" + - "build/${BOARD}/results.xml" + reports: + junit: "build/${BOARD}/results.xml" expire_in: 1 week rpi3: -- 2.47.2