[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/35] gitlab: wrap up test results for custom runners
From: |
Alex Bennée |
Subject: |
[PULL 17/35] gitlab: wrap up test results for custom runners |
Date: |
Thu, 26 Jan 2023 11:22:32 +0000 |
Instead of spewing the whole log to stdout lets just define them as
build artefacts so we can examine them later. Where we are running
check-tcg run it first as those tests are yet to be integrated into
meson. To avoid confusion we don't run multiple check-tcg tests at
once.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230124180127.1881110-18-alex.bennee@linaro.org>
diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml
index 97f99e29c2..9fdc476c48 100644
--- a/.gitlab-ci.d/custom-runners.yml
+++ b/.gitlab-ci.d/custom-runners.yml
@@ -13,6 +13,17 @@
variables:
GIT_STRATEGY: clone
+# All custom runners can extend this template to upload the testlog
+# data as an artifact and also feed the junit report
+.custom_artifacts_template:
+ artifacts:
+ name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
+ expire_in: 7 days
+ paths:
+ - build/meson-logs/testlog.txt
+ reports:
+ junit: build/meson-logs/testlog.junit.xml
+
include:
- local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml'
- local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml'
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
index fcaef9e5ef..f512eaeaa3 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
@@ -3,6 +3,7 @@
# "Install basic packages to build QEMU on Ubuntu 20.04/20.04"
ubuntu-20.04-s390x-all-linux-static:
+ extends: .custom_artifacts_template
needs: []
stage: build
tags:
@@ -19,12 +20,11 @@ ubuntu-20.04-s390x-all-linux-static:
- ../configure --enable-debug --static --disable-system --disable-glusterfs
--disable-libssh
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc`
+ - make --output-sync check-tcg
- make --output-sync -j`nproc` check
- || { cat meson-logs/testlog.txt; exit 1; } ;
- - make --output-sync -j`nproc` check-tcg
- || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-20.04-s390x-all:
+ extends: .custom_artifacts_template
needs: []
stage: build
tags:
@@ -41,9 +41,9 @@ ubuntu-20.04-s390x-all:
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc`
- make --output-sync -j`nproc` check
- || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-20.04-s390x-alldbg:
+ extends: .custom_artifacts_template
needs: []
stage: build
tags:
@@ -64,9 +64,9 @@ ubuntu-20.04-s390x-alldbg:
- make clean
- make --output-sync -j`nproc`
- make --output-sync -j`nproc` check
- || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-20.04-s390x-clang:
+ extends: .custom_artifacts_template
needs: []
stage: build
tags:
@@ -86,7 +86,6 @@ ubuntu-20.04-s390x-clang:
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc`
- make --output-sync -j`nproc` check
- || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-20.04-s390x-tci:
needs: []
@@ -109,6 +108,7 @@ ubuntu-20.04-s390x-tci:
- make --output-sync -j`nproc`
ubuntu-20.04-s390x-notcg:
+ extends: .custom_artifacts_template
needs: []
stage: build
tags:
@@ -128,4 +128,3 @@ ubuntu-20.04-s390x-notcg:
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc`
- make --output-sync -j`nproc` check
- || { cat meson-logs/testlog.txt; exit 1; } ;
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
index 2c386fa3e9..42137aaf2a 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
@@ -3,6 +3,7 @@
# "Install basic packages to build QEMU on Ubuntu 20.04"
ubuntu-22.04-aarch32-all:
+ extends: .custom_artifacts_template
needs: []
stage: build
tags:
@@ -22,4 +23,3 @@ ubuntu-22.04-aarch32-all:
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check
- || { cat meson-logs/testlog.txt; exit 1; } ;
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
index 725ca8ffea..8ba85be440 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
@@ -3,6 +3,7 @@
# "Install basic packages to build QEMU on Ubuntu 20.04"
ubuntu-22.04-aarch64-all-linux-static:
+ extends: .custom_artifacts_template
needs: []
stage: build
tags:
@@ -19,12 +20,11 @@ ubuntu-22.04-aarch64-all-linux-static:
- ../configure --enable-debug --static --disable-system --disable-pie
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc --ignore=40`
+ - make check-tcg
- make --output-sync -j`nproc --ignore=40` check
- || { cat meson-logs/testlog.txt; exit 1; } ;
- - make --output-sync -j`nproc --ignore=40` check-tcg
- || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-22.04-aarch64-all:
+ extends: .custom_artifacts_template
needs: []
stage: build
tags:
@@ -44,9 +44,9 @@ ubuntu-22.04-aarch64-all:
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check
- || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-22.04-aarch64-alldbg:
+ extends: .custom_artifacts_template
needs: []
stage: build
tags:
@@ -63,9 +63,9 @@ ubuntu-22.04-aarch64-alldbg:
- make clean
- make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check
- || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-22.04-aarch64-clang:
+ extends: .custom_artifacts_template
needs: []
stage: build
tags:
@@ -85,7 +85,6 @@ ubuntu-22.04-aarch64-clang:
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check
- || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-22.04-aarch64-tci:
needs: []
@@ -108,6 +107,7 @@ ubuntu-22.04-aarch64-tci:
- make --output-sync -j`nproc --ignore=40`
ubuntu-22.04-aarch64-notcg:
+ extends: .custom_artifacts_template
needs: []
stage: build
tags:
@@ -127,4 +127,3 @@ ubuntu-22.04-aarch64-notcg:
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check
- || { cat meson-logs/testlog.txt; exit 1; } ;
--
2.34.1
- [PULL 00/35] Testing, docs, semihosting and plugin updates, Alex Bennée, 2023/01/26
- [PULL 02/35] gitlab: add FF_SCRIPT_SECTIONS for timings, Alex Bennée, 2023/01/26
- [PULL 04/35] tests/unit: drop hacky race avoidance in test-io-channel-command, Alex Bennée, 2023/01/26
- [PULL 01/35] scripts/ci: update gitlab-runner playbook to use latest runner, Alex Bennée, 2023/01/26
- [PULL 03/35] gitlab: just use plain --cc=clang for custom runner build, Alex Bennée, 2023/01/26
- [PULL 05/35] build-sys: fix crlf-ending C code, Alex Bennée, 2023/01/26
- [PULL 10/35] Update lcitool and fedora to 37, Alex Bennée, 2023/01/26
- [PULL 12/35] lcitool: drop texinfo from QEMU project/dependencies, Alex Bennée, 2023/01/26
- [PULL 07/35] meson: replace Perl usage with Python, Alex Bennée, 2023/01/26
- [PULL 08/35] docs: drop texinfo options, Alex Bennée, 2023/01/26
- [PULL 17/35] gitlab: wrap up test results for custom runners,
Alex Bennée <=
- [PULL 11/35] lcitool: drop perl from QEMU project/dependencies, Alex Bennée, 2023/01/26
- [PULL 06/35] .gitlab-ci.d/windows: do not disable opengl, Alex Bennée, 2023/01/26
- [PULL 18/35] MAINTAINERS: Fix the entry for tests/tcg/nios2, Alex Bennée, 2023/01/26
- [PULL 14/35] tests/docker: drop debian-tricore-cross's partial status, Alex Bennée, 2023/01/26
- [PULL 28/35] thread: de-const qemu_spin_destroy, Alex Bennée, 2023/01/26
- [PULL 13/35] tests/docker: Install flex in debian-tricore-cross, Alex Bennée, 2023/01/26
- [PULL 15/35] tests/tcg: skip the vma-pthread test on CI, Alex Bennée, 2023/01/26
- [PULL 20/35] docs: add a new section to outline emulation support, Alex Bennée, 2023/01/26
- [PULL 29/35] util/qht: use striped locks under TSAN, Alex Bennée, 2023/01/26
- [PULL 09/35] gitlab: add lsan suppression file to workaround tcmalloc issues, Alex Bennée, 2023/01/26