[PATCH] gitlab-ci: adjust msys2-64bit to be able to run qtest

Paolo Bonzini posted 1 patch 2 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20240503121509.219567-1-pbonzini@redhat.com
Maintainers: Yonggang Luo <luoyonggang@gmail.com>, "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>
.gitlab-ci.d/windows.yml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
[PATCH] gitlab-ci: adjust msys2-64bit to be able to run qtest
Posted by Paolo Bonzini 2 weeks ago
sparc-softmmu is able to run a subset of qtests when compiled --without-default-devices,
so use it instead of x86_64-softmmu for the msys2 run.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 .gitlab-ci.d/windows.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
index 94834269ec7..d26dbdd0c0d 100644
--- a/.gitlab-ci.d/windows.yml
+++ b/.gitlab-ci.d/windows.yml
@@ -24,10 +24,7 @@ msys2-64bit:
     # changed to compile QEMU with the --without-default-devices switch
     # for this job, because otherwise the build could not complete within
     # the project timeout.
-    CONFIGURE_ARGS:  --target-list=x86_64-softmmu --without-default-devices -Ddebug=false -Doptimization=0
-    # qTests don't run successfully with "--without-default-devices",
-    # so let's exclude the qtests from CI for now.
-    TEST_ARGS: --no-suite qtest
+    CONFIGURE_ARGS:  --target-list=sparc-softmmu --without-default-devices -Ddebug=false -Doptimization=0
     # The Windows git is a bit older so override the default
     GIT_FETCH_EXTRA_FLAGS: --no-tags --prune --quiet
   artifacts:
-- 
2.44.0
Re: [PATCH] gitlab-ci: adjust msys2-64bit to be able to run qtest
Posted by Daniel P. Berrangé 2 weeks ago
On Fri, May 03, 2024 at 02:15:09PM +0200, Paolo Bonzini wrote:
> sparc-softmmu is able to run a subset of qtests when compiled --without-default-devices,
> so use it instead of x86_64-softmmu for the msys2 run.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  .gitlab-ci.d/windows.yml | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
> index 94834269ec7..d26dbdd0c0d 100644
> --- a/.gitlab-ci.d/windows.yml
> +++ b/.gitlab-ci.d/windows.yml
> @@ -24,10 +24,7 @@ msys2-64bit:
>      # changed to compile QEMU with the --without-default-devices switch
>      # for this job, because otherwise the build could not complete within
>      # the project timeout.
> -    CONFIGURE_ARGS:  --target-list=x86_64-softmmu --without-default-devices -Ddebug=false -Doptimization=0
> -    # qTests don't run successfully with "--without-default-devices",
> -    # so let's exclude the qtests from CI for now.
> -    TEST_ARGS: --no-suite qtest
> +    CONFIGURE_ARGS:  --target-list=sparc-softmmu --without-default-devices -Ddebug=false -Doptimization=0

We have compile coverage of x86_64-softmmu on the cross-win64 mingw
job. So we're not loosing any compile coverage in aggregate with
this change, in fact we improve it by compiling sparc here.

The msys2-64bit job currently takes 50mins wallclock just to compile
and run unit tests though, which is quite long already.

What's the new running time when you enable qtest too ?

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
Re: [PATCH] gitlab-ci: adjust msys2-64bit to be able to run qtest
Posted by Paolo Bonzini 2 weeks ago
On Fri, May 3, 2024 at 2:29 PM Daniel P. Berrangé <berrange@redhat.com> wrote:
> We have compile coverage of x86_64-softmmu on the cross-win64 mingw
> job. So we're not loosing any compile coverage in aggregate with
> this change, in fact we improve it by compiling sparc here.
>
> The msys2-64bit job currently takes 50mins wallclock just to compile
> and run unit tests though, which is quite long already.
>
> What's the new running time when you enable qtest too ?

It's very variable. The run I did to test it
(https://gitlab.com/bonzini/qemu/-/jobs/6773108916) took 80 minutes,
but it seemed to be a slow one. Yesterday afternoon I had a run that
took 80 minutes and failed the build (so it didn't run "make check" at
all).

There are just a dozen qtests that run, the useful part is checking
that you can run qtests at all under Windows.

Paolo