gitlab: wrap up test results for custom runners
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>
This commit is contained in:
parent
57dbce5a4f
commit
6e890b0521
|
@ -13,6 +13,17 @@
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: clone
|
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:
|
include:
|
||||||
- local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml'
|
- local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml'
|
||||||
- local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml'
|
- local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml'
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
# "Install basic packages to build QEMU on Ubuntu 20.04/20.04"
|
# "Install basic packages to build QEMU on Ubuntu 20.04/20.04"
|
||||||
|
|
||||||
ubuntu-20.04-s390x-all-linux-static:
|
ubuntu-20.04-s390x-all-linux-static:
|
||||||
|
extends: .custom_artifacts_template
|
||||||
needs: []
|
needs: []
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
|
@ -19,12 +20,11 @@ ubuntu-20.04-s390x-all-linux-static:
|
||||||
- ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh
|
- ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh
|
||||||
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
||||||
- make --output-sync -j`nproc`
|
- make --output-sync -j`nproc`
|
||||||
|
- make --output-sync check-tcg
|
||||||
- make --output-sync -j`nproc` check
|
- 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:
|
ubuntu-20.04-s390x-all:
|
||||||
|
extends: .custom_artifacts_template
|
||||||
needs: []
|
needs: []
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
|
@ -41,9 +41,9 @@ ubuntu-20.04-s390x-all:
|
||||||
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
||||||
- make --output-sync -j`nproc`
|
- make --output-sync -j`nproc`
|
||||||
- make --output-sync -j`nproc` check
|
- make --output-sync -j`nproc` check
|
||||||
|| { cat meson-logs/testlog.txt; exit 1; } ;
|
|
||||||
|
|
||||||
ubuntu-20.04-s390x-alldbg:
|
ubuntu-20.04-s390x-alldbg:
|
||||||
|
extends: .custom_artifacts_template
|
||||||
needs: []
|
needs: []
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
|
@ -64,9 +64,9 @@ ubuntu-20.04-s390x-alldbg:
|
||||||
- make clean
|
- make clean
|
||||||
- make --output-sync -j`nproc`
|
- make --output-sync -j`nproc`
|
||||||
- make --output-sync -j`nproc` check
|
- make --output-sync -j`nproc` check
|
||||||
|| { cat meson-logs/testlog.txt; exit 1; } ;
|
|
||||||
|
|
||||||
ubuntu-20.04-s390x-clang:
|
ubuntu-20.04-s390x-clang:
|
||||||
|
extends: .custom_artifacts_template
|
||||||
needs: []
|
needs: []
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
|
@ -86,7 +86,6 @@ ubuntu-20.04-s390x-clang:
|
||||||
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
||||||
- make --output-sync -j`nproc`
|
- make --output-sync -j`nproc`
|
||||||
- make --output-sync -j`nproc` check
|
- make --output-sync -j`nproc` check
|
||||||
|| { cat meson-logs/testlog.txt; exit 1; } ;
|
|
||||||
|
|
||||||
ubuntu-20.04-s390x-tci:
|
ubuntu-20.04-s390x-tci:
|
||||||
needs: []
|
needs: []
|
||||||
|
@ -109,6 +108,7 @@ ubuntu-20.04-s390x-tci:
|
||||||
- make --output-sync -j`nproc`
|
- make --output-sync -j`nproc`
|
||||||
|
|
||||||
ubuntu-20.04-s390x-notcg:
|
ubuntu-20.04-s390x-notcg:
|
||||||
|
extends: .custom_artifacts_template
|
||||||
needs: []
|
needs: []
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
|
@ -128,4 +128,3 @@ ubuntu-20.04-s390x-notcg:
|
||||||
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
||||||
- make --output-sync -j`nproc`
|
- make --output-sync -j`nproc`
|
||||||
- make --output-sync -j`nproc` check
|
- make --output-sync -j`nproc` check
|
||||||
|| { cat meson-logs/testlog.txt; exit 1; } ;
|
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
# "Install basic packages to build QEMU on Ubuntu 20.04"
|
# "Install basic packages to build QEMU on Ubuntu 20.04"
|
||||||
|
|
||||||
ubuntu-22.04-aarch32-all:
|
ubuntu-22.04-aarch32-all:
|
||||||
|
extends: .custom_artifacts_template
|
||||||
needs: []
|
needs: []
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
|
@ -22,4 +23,3 @@ ubuntu-22.04-aarch32-all:
|
||||||
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
||||||
- make --output-sync -j`nproc --ignore=40`
|
- make --output-sync -j`nproc --ignore=40`
|
||||||
- make --output-sync -j`nproc --ignore=40` check
|
- make --output-sync -j`nproc --ignore=40` check
|
||||||
|| { cat meson-logs/testlog.txt; exit 1; } ;
|
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
# "Install basic packages to build QEMU on Ubuntu 20.04"
|
# "Install basic packages to build QEMU on Ubuntu 20.04"
|
||||||
|
|
||||||
ubuntu-22.04-aarch64-all-linux-static:
|
ubuntu-22.04-aarch64-all-linux-static:
|
||||||
|
extends: .custom_artifacts_template
|
||||||
needs: []
|
needs: []
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
|
@ -19,12 +20,11 @@ ubuntu-22.04-aarch64-all-linux-static:
|
||||||
- ../configure --enable-debug --static --disable-system --disable-pie
|
- ../configure --enable-debug --static --disable-system --disable-pie
|
||||||
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
||||||
- make --output-sync -j`nproc --ignore=40`
|
- make --output-sync -j`nproc --ignore=40`
|
||||||
|
- make check-tcg
|
||||||
- make --output-sync -j`nproc --ignore=40` check
|
- 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:
|
ubuntu-22.04-aarch64-all:
|
||||||
|
extends: .custom_artifacts_template
|
||||||
needs: []
|
needs: []
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
|
@ -44,9 +44,9 @@ ubuntu-22.04-aarch64-all:
|
||||||
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
||||||
- make --output-sync -j`nproc --ignore=40`
|
- make --output-sync -j`nproc --ignore=40`
|
||||||
- make --output-sync -j`nproc --ignore=40` check
|
- make --output-sync -j`nproc --ignore=40` check
|
||||||
|| { cat meson-logs/testlog.txt; exit 1; } ;
|
|
||||||
|
|
||||||
ubuntu-22.04-aarch64-alldbg:
|
ubuntu-22.04-aarch64-alldbg:
|
||||||
|
extends: .custom_artifacts_template
|
||||||
needs: []
|
needs: []
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
|
@ -63,9 +63,9 @@ ubuntu-22.04-aarch64-alldbg:
|
||||||
- make clean
|
- make clean
|
||||||
- make --output-sync -j`nproc --ignore=40`
|
- make --output-sync -j`nproc --ignore=40`
|
||||||
- make --output-sync -j`nproc --ignore=40` check
|
- make --output-sync -j`nproc --ignore=40` check
|
||||||
|| { cat meson-logs/testlog.txt; exit 1; } ;
|
|
||||||
|
|
||||||
ubuntu-22.04-aarch64-clang:
|
ubuntu-22.04-aarch64-clang:
|
||||||
|
extends: .custom_artifacts_template
|
||||||
needs: []
|
needs: []
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
|
@ -85,7 +85,6 @@ ubuntu-22.04-aarch64-clang:
|
||||||
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
||||||
- make --output-sync -j`nproc --ignore=40`
|
- make --output-sync -j`nproc --ignore=40`
|
||||||
- make --output-sync -j`nproc --ignore=40` check
|
- make --output-sync -j`nproc --ignore=40` check
|
||||||
|| { cat meson-logs/testlog.txt; exit 1; } ;
|
|
||||||
|
|
||||||
ubuntu-22.04-aarch64-tci:
|
ubuntu-22.04-aarch64-tci:
|
||||||
needs: []
|
needs: []
|
||||||
|
@ -108,6 +107,7 @@ ubuntu-22.04-aarch64-tci:
|
||||||
- make --output-sync -j`nproc --ignore=40`
|
- make --output-sync -j`nproc --ignore=40`
|
||||||
|
|
||||||
ubuntu-22.04-aarch64-notcg:
|
ubuntu-22.04-aarch64-notcg:
|
||||||
|
extends: .custom_artifacts_template
|
||||||
needs: []
|
needs: []
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
|
@ -127,4 +127,3 @@ ubuntu-22.04-aarch64-notcg:
|
||||||
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
||||||
- make --output-sync -j`nproc --ignore=40`
|
- make --output-sync -j`nproc --ignore=40`
|
||||||
- make --output-sync -j`nproc --ignore=40` check
|
- make --output-sync -j`nproc --ignore=40` check
|
||||||
|| { cat meson-logs/testlog.txt; exit 1; } ;
|
|
||||||
|
|
Loading…
Reference in New Issue