We are preparing to drop the Makefile logic that installs python test
prerequisites, and so the trick to suppress ninja from re-configuring
the project will no longer work.

Move the "check-venv" step into the build part of the image instead so
that it is available for the fedora and debian device crash tests.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 .gitlab-ci.d/buildtest.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index 97bddbffb40..bf0fad1df10 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -72,7 +72,7 @@ build-system-debian:
     CONFIGURE_ARGS: --with-coroutine=sigaltstack --enable-rust
     TARGETS: arm-softmmu i386-softmmu riscv64-softmmu sh4eb-softmmu
       sparc-softmmu xtensa-softmmu
-    MAKE_CHECK_ARGS: check-build
+    MAKE_CHECK_ARGS: check-venv check-build
 
 check-system-debian:
   extends: .native_test_job_template
@@ -101,7 +101,6 @@ crash-test-debian:
     IMAGE: debian
   script:
     - cd build
-    - make NINJA=":" check-venv
     - pyvenv/bin/python3 scripts/device-crash-test -q --tcg-only ./qemu-system-i386
 
 build-system-fedora:
@@ -115,7 +114,7 @@ build-system-fedora:
     CONFIGURE_ARGS: --disable-gcrypt --enable-nettle --enable-docs --enable-crypto-afalg --enable-rust
     TARGETS: microblaze-softmmu mips-softmmu
       xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu
-    MAKE_CHECK_ARGS: check-build check-doc
+    MAKE_CHECK_ARGS: check-venv check-build check-doc
 
 build-system-fedora-rust-nightly:
   extends:
@@ -158,7 +157,6 @@ crash-test-fedora:
     IMAGE: fedora
   script:
     - cd build
-    - make NINJA=":" check-venv
     - pyvenv/bin/python3 scripts/device-crash-test -q ./qemu-system-ppc
     - pyvenv/bin/python3 scripts/device-crash-test -q ./qemu-system-riscv32
 
-- 
2.51.1

On 05/12/2025 07.00, John Snow wrote:
> We are preparing to drop the Makefile logic that installs python test
> prerequisites, and so the trick to suppress ninja from re-configuring
> the project will no longer work.
> 
> Move the "check-venv" step into the build part of the image instead so
> that it is available for the fedora and debian device crash tests.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>   .gitlab-ci.d/buildtest.yml | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)


Reviewed-by: Thomas Huth <thuth@redhat.com>