[kvm-unit-tests PATCH v8 35/35] powerpc: gitlab CI update

Nicholas Piggin
2024-04-05T08:38:16Z

This adds testing for the powernv machine, and adds a gitlab-ci test
group instead of specifying all tests in .gitlab-ci.yml.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
.gitlab-ci.yml | 30 ++++++++----------------------
powerpc/unittests.cfg | 14 ++++++++------
2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60b3cdfd2..e3638b088 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,17 +97,10 @@ build-ppc64be:
- cd build
- ../configure --arch=ppc64 --endian=big --cross-prefix=powerpc64-linux-gnu-
- make -j2
- - ACCEL=tcg ./run_tests.sh
- selftest-setup
- selftest-migration
- selftest-migration-skip
- spapr_hcall
- rtas-get-time-of-day
- rtas-get-time-of-day-base
- rtas-set-time-of-day
- emulator
- | tee results.txt
- - if grep -q FAIL results.txt ; then exit 1 ; fi
+ - ACCEL=tcg MAX_SMP=8 ./run_tests.sh -g gitlab-ci | tee results.txt
+ - grep -q PASS results.txt && ! grep -q FAIL results.txt
+ - ACCEL=tcg MAX_SMP=8 MACHINE=powernv ./run_tests.sh -g gitlab-ci | tee results.txt
+ - grep -q PASS results.txt && ! grep -q FAIL results.txt

build-ppc64le:
extends: .intree_template
@@ -115,17 +108,10 @@ build-ppc64le:
- dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu nmap-ncat
- ./configure --arch=ppc64 --endian=little --cross-prefix=powerpc64-linux-gnu-
- make -j2
- - ACCEL=tcg ./run_tests.sh
- selftest-setup
- selftest-migration
- selftest-migration-skip
- spapr_hcall
- rtas-get-time-of-day
- rtas-get-time-of-day-base
- rtas-set-time-of-day
- emulator
- | tee results.txt
- - if grep -q FAIL results.txt ; then exit 1 ; fi
+ - ACCEL=tcg MAX_SMP=8 ./run_tests.sh -g gitlab-ci | tee results.txt
+ - grep -q PASS results.txt && ! grep -q FAIL results.txt
+ - ACCEL=tcg MAX_SMP=8 MACHINE=powernv ./run_tests.sh -g gitlab-ci | tee results.txt
+ - grep -q PASS results.txt && ! grep -q FAIL results.txt

# build-riscv32:
# Fedora doesn't package a riscv32 compiler for QEMU. Oh, well.
diff --git a/powerpc/unittests.cfg b/powerpc/unittests.cfg
index 379aa166b..f6ddc4a7f 100644
--- a/powerpc/unittests.cfg
+++ b/powerpc/unittests.cfg
@@ -16,12 +16,12 @@
file = selftest.elf
smp = 2
extra_params = -m 1g -append 'setup smp=2 mem=1024'
-groups = selftest
+groups = selftest gitlab-ci

[selftest-migration]
file = selftest-migration.elf
machine = pseries
-groups = selftest migration
+groups = selftest migration gitlab-ci
# TODO: Remove accel=kvm once the following TCG migration fix has been merged:
# https://lore.kernel.org/qemu-devel/20240219061731.232570-1-npiggin@gmail.com/
accel = kvm
@@ -29,7 +29,7 @@ accel = kvm
[selftest-migration-skip]
file = selftest-migration.elf
machine = pseries
-groups = selftest migration
+groups = selftest migration gitlab-ci
extra_params = -append "skip"

# This fails due to a QEMU TCG bug so KVM-only until QEMU is fixed upstream
@@ -42,6 +42,7 @@ groups = migration
[spapr_hcall]
file = spapr_hcall.elf
machine = pseries
+groups = gitlab-ci

[spapr_vpa]
file = spapr_vpa.elf
@@ -52,24 +53,25 @@ file = rtas.elf
machine = pseries
timeout = 5
extra_params = -append "get-time-of-day date=$(date +%s)"
-groups = rtas
+groups = rtas gitlab-ci

[rtas-get-time-of-day-base]
file = rtas.elf
machine = pseries
timeout = 5
extra_params = -rtc base="2006-06-17" -append "get-time-of-day date=$(date --date="2006-06-17 UTC" +%s)"
-groups = rtas
+groups = rtas gitlab-ci

[rtas-set-time-of-day]
file = rtas.elf
machine = pseries
extra_params = -append "set-time-of-day"
timeout = 5
-groups = rtas
+groups = rtas gitlab-ci

[emulator]
file = emulator.elf
+groups = gitlab-ci

[interrupts]
file = interrupts.elf
--
2.43.0