[PATCH] gitlab-ci.yml: Run check-tcg with TCI

[PATCH] gitlab-ci.yml: Run check-tcg with TCI

[Thomas Huth]

It's now possible to also run the non-x86 TCG tests with TCI.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 Based-on: 20210126192518.2019885-1-sw@weilnetz.de
 CI-run: https://gitlab.com/huth/qemu/-/jobs/988742434#L5200

 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de3a3d25b5..19602f4319 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -475,7 +475,7 @@ build-oss-fuzz:
 build-tci:
   <<: *native_build_job_definition
   variables:
-    IMAGE: fedora
+    IMAGE: debian-all-test-cross
   script:
     - TARGETS="aarch64 alpha arm hppa m68k microblaze moxie ppc64 s390x x86_64"
     - mkdir build
@@ -483,7 +483,6 @@ build-tci:
     - ../configure --enable-tcg-interpreter
         --target-list="$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '; done)" || { cat config.log meson-logs/meson-log.txt && exit 1; }
     - make -j"$JOBS"
-    - make run-tcg-tests-x86_64-softmmu
     - make tests/qtest/boot-serial-test tests/qtest/cdrom-test tests/qtest/pxe-test
     - for tg in $TARGETS ; do
         export QTEST_QEMU_BINARY="./qemu-system-${tg}" ;
@@ -492,6 +491,7 @@ build-tci:
       done
     - QTEST_QEMU_BINARY="./qemu-system-x86_64" ./tests/qtest/pxe-test
     - QTEST_QEMU_BINARY="./qemu-system-s390x" ./tests/qtest/pxe-test -m slow
+    - make check-tcg
 
 # Alternate coroutines implementations are only really of interest to KVM users
 # However we can't test against KVM on Gitlab-CI so we can only run unit tests
-- 
2.27.0

Re: [PATCH] gitlab-ci.yml: Run check-tcg with TCI

[Alex Bennée]

Thomas Huth <thuth@redhat.com> writes:

> It's now possible to also run the non-x86 TCG tests with TCI.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Queued to testing/next, thanks.

> ---
>  Based-on: 20210126192518.2019885-1-sw@weilnetz.de
>  CI-run: https://gitlab.com/huth/qemu/-/jobs/988742434#L5200
>
>  .gitlab-ci.yml | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index de3a3d25b5..19602f4319 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -475,7 +475,7 @@ build-oss-fuzz:
>  build-tci:
>    <<: *native_build_job_definition
>    variables:
> -    IMAGE: fedora
> +    IMAGE: debian-all-test-cross
>    script:
>      - TARGETS="aarch64 alpha arm hppa m68k microblaze moxie ppc64 s390x x86_64"
>      - mkdir build
> @@ -483,7 +483,6 @@ build-tci:
>      - ../configure --enable-tcg-interpreter
>          --target-list="$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '; done)" || { cat config.log meson-logs/meson-log.txt && exit 1; }
>      - make -j"$JOBS"
> -    - make run-tcg-tests-x86_64-softmmu
>      - make tests/qtest/boot-serial-test tests/qtest/cdrom-test tests/qtest/pxe-test
>      - for tg in $TARGETS ; do
>          export QTEST_QEMU_BINARY="./qemu-system-${tg}" ;
> @@ -492,6 +491,7 @@ build-tci:
>        done
>      - QTEST_QEMU_BINARY="./qemu-system-x86_64" ./tests/qtest/pxe-test
>      - QTEST_QEMU_BINARY="./qemu-system-s390x" ./tests/qtest/pxe-test -m slow
> +    - make check-tcg
>  
>  # Alternate coroutines implementations are only really of interest to KVM users
>  # However we can't test against KVM on Gitlab-CI so we can only run unit tests


-- 
Alex Bennée