[kvm-unit-tests PATCH v10 15/15] powerpc/gitlab-ci: Enable more tests with Fedora 40

[Nicholas Piggin]

With Fedora 40 (QEMU 8.2), more tests can be enabled.

Signed-off-by: Nicholas Piggin <npiggin at gmail.com>
---
 .gitlab-ci.yml        |  2 +-
 powerpc/unittests.cfg | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ffb3767ec..ee14330a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,7 +110,7 @@ build-ppc64le:
  extends: .intree_template
  image: fedora:40
  script:
- - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu nmap-ncat
+ - dnf install -y qemu-system-ppc gcc-powerpc64-linux-gnu nmap-ncat jq
  - ./configure --arch=ppc64 --endian=little --cross-prefix=powerpc64-linux-gnu-
  - make -j2
  - ACCEL=tcg MAX_SMP=8 ./run_tests.sh -g gitlab-ci
diff --git a/powerpc/unittests.cfg b/powerpc/unittests.cfg
index 9e7df22f4..27092b185 100644
--- a/powerpc/unittests.cfg
+++ b/powerpc/unittests.cfg
@@ -28,7 +28,7 @@ file = selftest-migration.elf
 machine = pseries
 groups = selftest migration
 
-# QEMU 7.0 (Fedora 37) in gitlab CI has known migration bugs in TCG, so
+# QEMU 8.2 (Fedora 40) in gitlab CI has known migration bugs in TCG, so
 # make a kvm-only version for CI
 [selftest-migration-ci]
 file = selftest-migration.elf
@@ -81,18 +81,18 @@ groups = rtas gitlab-ci
 file = emulator.elf
 groups = gitlab-ci
 
-# QEMU 7.0 (Fedora 37) in gitlab CI fails this
+# QEMU 8.2 in Fedora 40 fails because it allows supervisor to change MSR[ME]
 [interrupts]
 file = interrupts.elf
 
-# QEMU 7.0 (Fedora 37) in gitlab CI fails this
 [mmu]
 file = mmu.elf
 smp = 2
+groups = gitlab-ci
 
-# QEMU 7.0 (Fedora 37) in gitlab CI fails this
 [pmu]
 file = pmu.elf
+groups = gitlab-ci
 
 [smp]
 file = smp.elf
@@ -120,15 +120,15 @@ machine = pseries
 extra_params = -append "migration -m"
 groups = migration gitlab-ci
 
-# QEMU 7.0 (Fedora 37) in gitlab CI fails this
 [timebase]
 file = timebase.elf
+groups = gitlab-ci
 
-# QEMU 7.0 (Fedora 37) in gitlab CI fails this
 [timebase-icount]
 file = timebase.elf
 accel = tcg
 extra_params = -icount shift=5
+groups = gitlab-ci
 
 [h_cede_tm]
 file = tm.elf
@@ -138,16 +138,15 @@ smp = 2,threads=2
 extra_params = -machine cap-htm=on -append "h_cede_tm"
 groups = h_cede_tm
 
-# QEMU 7.0 (Fedora 37) in gitlab CI fails this
 [sprs]
 file = sprs.elf
+groups = gitlab-ci
 
-# QEMU 7.0 (Fedora 37) in gitlab CI fails this
 [sprs-migration]
 file = sprs.elf
 machine = pseries
 extra_params = -append '-w'
-groups = migration
+groups = migration gitlab-ci
 
 # Too costly to run in CI
 [sieve]
-- 
2.45.1