@@ -32,5 +32,6 @@ build_task:
- $MAKE -j$(sysctl -n hw.ncpu)
- for TARGET in $TEST_TARGETS ;
do
- $MAKE -j$(sysctl -n hw.ncpu) $TARGET V=1 ;
+ $MAKE -j$(sysctl -n hw.ncpu) $TARGET V=1
+ || { cat meson-logs/testlog.txt; exit 1; } ;
done
@@ -23,6 +23,8 @@ centos-stream-8-x86_64:
- mkdir build
- cd build
- ../scripts/ci/org.centos/stream/8/x86_64/configure
+ || { cat config.log meson-logs/meson-log.txt; exit 1; }
- make -j"$JOBS"
- make NINJA=":" check
+ || { cat meson-logs/testlog.txt; exit 1; } ;
- ../scripts/ci/org.centos/stream/8/x86_64/test-avocado
@@ -19,5 +19,7 @@ ubuntu-20.04-aarch32-all:
- mkdir build
- cd build
- ../configure --cross-prefix=arm-linux-gnueabihf-
+ || { 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 V=1
+ || { cat meson-logs/testlog.txt; exit 1; } ;
@@ -17,9 +17,12 @@ ubuntu-20.04-aarch64-all-linux-static:
- mkdir build
- cd build
- ../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 --ignore=40`
- make --output-sync -j`nproc --ignore=40` check V=1
+ || { cat meson-logs/testlog.txt; exit 1; } ;
- make --output-sync -j`nproc --ignore=40` check-tcg V=1
+ || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-20.04-aarch64-all:
needs: []
@@ -38,8 +41,10 @@ ubuntu-20.04-aarch64-all:
- mkdir build
- cd build
- ../configure --disable-libssh
+ || { 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 V=1
+ || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-20.04-aarch64-alldbg:
needs: []
@@ -54,9 +59,11 @@ ubuntu-20.04-aarch64-alldbg:
- mkdir build
- cd build
- ../configure --enable-debug --disable-libssh
+ || { cat config.log meson-logs/meson-log.txt; exit 1; }
- make clean
- make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check V=1
+ || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-20.04-aarch64-clang:
needs: []
@@ -75,8 +82,10 @@ ubuntu-20.04-aarch64-clang:
- mkdir build
- cd build
- ../configure --disable-libssh --cc=clang-10 --cxx=clang++-10 --enable-sanitizers
+ || { 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 V=1
+ || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-20.04-aarch64-tci:
needs: []
@@ -95,6 +104,7 @@ ubuntu-20.04-aarch64-tci:
- mkdir build
- cd build
- ../configure --disable-libssh --enable-tcg-interpreter
+ || { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc --ignore=40`
ubuntu-20.04-aarch64-notcg:
@@ -114,5 +124,7 @@ ubuntu-20.04-aarch64-notcg:
- mkdir build
- cd build
- ../configure --disable-libssh --disable-tcg
+ || { 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 V=1
+ || { cat meson-logs/testlog.txt; exit 1; } ;
@@ -19,9 +19,12 @@ ubuntu-20.04-s390x-all-linux-static:
- mkdir build
- cd build
- ../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 -j`nproc` check V=1
+ || { cat meson-logs/testlog.txt; exit 1; } ;
- make --output-sync -j`nproc` check-tcg V=1
+ || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-20.04-s390x-all:
needs: []
@@ -39,8 +42,10 @@ ubuntu-20.04-s390x-all:
- mkdir build
- cd build
- ../configure --disable-libssh
+ || { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc`
- make --output-sync -j`nproc` check V=1
+ || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-20.04-s390x-alldbg:
needs: []
@@ -61,9 +66,11 @@ ubuntu-20.04-s390x-alldbg:
- mkdir build
- cd build
- ../configure --enable-debug --disable-libssh
+ || { cat config.log meson-logs/meson-log.txt; exit 1; }
- make clean
- make --output-sync -j`nproc`
- make --output-sync -j`nproc` check V=1
+ || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-20.04-s390x-clang:
needs: []
@@ -84,8 +91,10 @@ ubuntu-20.04-s390x-clang:
- mkdir build
- cd build
- ../configure --disable-libssh --cc=clang --cxx=clang++ --enable-sanitizers
+ || { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc`
- make --output-sync -j`nproc` check V=1
+ || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-20.04-s390x-tci:
needs: []
@@ -106,6 +115,7 @@ ubuntu-20.04-s390x-tci:
- mkdir build
- cd build
- ../configure --disable-libssh --enable-tcg-interpreter
+ || { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc`
ubuntu-20.04-s390x-notcg:
@@ -127,5 +137,7 @@ ubuntu-20.04-s390x-notcg:
- mkdir build
- cd build
- ../configure --disable-libssh --disable-tcg
+ || { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc`
- make --output-sync -j`nproc` check V=1
+ || { cat meson-logs/testlog.txt; exit 1; } ;
When tests fail meson just displays a summary and tells you to look at the testlog.txt file for details. The native jobs on shared runners publish testlog.txt as an artifact. For the Cirrus jobs and custom runner jobs this is not currently possible. The best we can do is cat the log contents on failure, to give maintainers a fighting chance of diagnosing the problem. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- .gitlab-ci.d/cirrus/build.yml | 3 ++- .../custom-runners/centos-stream-8-x86_64.yml | 2 ++ .gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml | 2 ++ .gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml | 12 ++++++++++++ .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml | 12 ++++++++++++ 5 files changed, 30 insertions(+), 1 deletion(-)