mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitlab-ci: Add "check-functional" to the build tests

Browse Source 
Now that we converted many tests from the "check-avocado" test suite
to the "check-functional" test suite, we should make sure that these
also get tested in the CI.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240830133841.142644-41-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2024-08-30 15:38:34 +02:00
parent b308ac9cf6
commit 6d62722ebd
2 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab-ci.d/buildtest-template.yml
View File

@ -59,6 +59,10 @@
- cd build - cd build
- find . -type f -exec touch {} + - find . -type f -exec touch {} +
# Avoid recompiling by hiding ninja with NINJA=":" # Avoid recompiling by hiding ninja with NINJA=":"
# We also have to pre-cache the functional tests manually in this case
- if [ "x${QEMU_TEST_CACHE_DIR}" != "x" ]; then
$MAKE precache-functional ;
fi
- $MAKE NINJA=":" $MAKE_CHECK_ARGS - $MAKE NINJA=":" $MAKE_CHECK_ARGS
.native_test_job_template: .native_test_job_template:
@ -72,12 +76,13 @@
reports: reports:
junit: build/meson-logs/testlog.junit.xml junit: build/meson-logs/testlog.junit.xml
.avocado_test_job_template: .functional_test_job_template:
extends: .common_test_job_template extends: .common_test_job_template
cache: cache:
key: "${CI_JOB_NAME}-cache" key: "${CI_JOB_NAME}-cache"
paths: paths:
- ${CI_PROJECT_DIR}/avocado-cache - ${CI_PROJECT_DIR}/avocado-cache
- ${CI_PROJECT_DIR}/functional-cache
policy: pull-push policy: pull-push
artifacts: artifacts:
name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
@ -86,6 +91,7 @@
paths: paths:
- build/tests/results/latest/results.xml - build/tests/results/latest/results.xml
- build/tests/results/latest/test-results - build/tests/results/latest/test-results
- build/tests/functional/*/*/*.log
reports: reports:
junit: build/tests/results/latest/results.xml junit: build/tests/results/latest/results.xml
before_script: before_script:
@ -96,11 +102,13 @@
- echo -e '[job.output.testlogs]\nstatuses = ["FAIL", "INTERRUPT"]' - echo -e '[job.output.testlogs]\nstatuses = ["FAIL", "INTERRUPT"]'
>> ~/.config/avocado/avocado.conf >> ~/.config/avocado/avocado.conf
- if [ -d ${CI_PROJECT_DIR}/avocado-cache ]; then - if [ -d ${CI_PROJECT_DIR}/avocado-cache ]; then
du -chs ${CI_PROJECT_DIR}/avocado-cache ; du -chs ${CI_PROJECT_DIR}/*-cache ;
fi fi
- export AVOCADO_ALLOW_UNTRUSTED_CODE=1 - export AVOCADO_ALLOW_UNTRUSTED_CODE=1
- export QEMU_TEST_ALLOW_UNTRUSTED_CODE=1
- export QEMU_TEST_CACHE_DIR=${CI_PROJECT_DIR}/functional-cache
after_script: after_script:
- cd build - cd build
- du -chs ${CI_PROJECT_DIR}/avocado-cache - du -chs ${CI_PROJECT_DIR}/*-cache
variables: variables:
QEMU_JOB_AVOCADO: 1 QEMU_JOB_AVOCADO: 1

60
.gitlab-ci.d/buildtest.yml
View File

@ -22,14 +22,14 @@ check-system-alpine:
IMAGE: alpine IMAGE: alpine
MAKE_CHECK_ARGS: check-unit check-qtest MAKE_CHECK_ARGS: check-unit check-qtest
avocado-system-alpine: functional-system-alpine:
extends: .avocado_test_job_template extends: .functional_test_job_template
needs: needs:
- job: build-system-alpine - job: build-system-alpine
artifacts: true artifacts: true
variables: variables:
IMAGE: alpine IMAGE: alpine
MAKE_CHECK_ARGS: check-avocado MAKE_CHECK_ARGS: check-avocado check-functional
AVOCADO_TAGS: arch:avr arch:loongarch64 arch:mips64 arch:mipsel AVOCADO_TAGS: arch:avr arch:loongarch64 arch:mips64 arch:mipsel
build-system-ubuntu: build-system-ubuntu:
@ -53,14 +53,14 @@ check-system-ubuntu:
IMAGE: ubuntu2204 IMAGE: ubuntu2204
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
avocado-system-ubuntu: functional-system-ubuntu:
extends: .avocado_test_job_template extends: .functional_test_job_template
needs: needs:
- job: build-system-ubuntu - job: build-system-ubuntu
artifacts: true artifacts: true
variables: variables:
IMAGE: ubuntu2204 IMAGE: ubuntu2204
MAKE_CHECK_ARGS: check-avocado MAKE_CHECK_ARGS: check-avocado check-functional
AVOCADO_TAGS: arch:alpha arch:microblazeel arch:mips64el AVOCADO_TAGS: arch:alpha arch:microblazeel arch:mips64el
build-system-debian: build-system-debian:
@ -85,14 +85,14 @@ check-system-debian:
IMAGE: debian IMAGE: debian
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
avocado-system-debian: functional-system-debian:
extends: .avocado_test_job_template extends: .functional_test_job_template
needs: needs:
- job: build-system-debian - job: build-system-debian
artifacts: true artifacts: true
variables: variables:
IMAGE: debian IMAGE: debian
MAKE_CHECK_ARGS: check-avocado MAKE_CHECK_ARGS: check-avocado check-functional
AVOCADO_TAGS: arch:arm arch:i386 arch:riscv64 arch:sh4 arch:sparc arch:xtensa AVOCADO_TAGS: arch:arm arch:i386 arch:riscv64 arch:sh4 arch:sparc arch:xtensa
crash-test-debian: crash-test-debian:
@ -129,14 +129,14 @@ check-system-fedora:
IMAGE: fedora IMAGE: fedora
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
avocado-system-fedora: functional-system-fedora:
extends: .avocado_test_job_template extends: .functional_test_job_template
needs: needs:
- job: build-system-fedora - job: build-system-fedora
artifacts: true artifacts: true
variables: variables:
IMAGE: fedora IMAGE: fedora
MAKE_CHECK_ARGS: check-avocado MAKE_CHECK_ARGS: check-avocado check-functional
AVOCADO_TAGS: arch:microblaze arch:mips arch:xtensa arch:m68k AVOCADO_TAGS: arch:microblaze arch:mips arch:xtensa arch:m68k
arch:riscv32 arch:ppc arch:sparc64 arch:riscv32 arch:ppc arch:sparc64
@ -243,14 +243,14 @@ check-system-centos:
IMAGE: centos9 IMAGE: centos9
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
avocado-system-centos: functional-system-centos:
extends: .avocado_test_job_template extends: .functional_test_job_template
needs: needs:
- job: build-system-centos - job: build-system-centos
artifacts: true artifacts: true
variables: variables:
IMAGE: centos9 IMAGE: centos9
MAKE_CHECK_ARGS: check-avocado MAKE_CHECK_ARGS: check-avocado check-functional
AVOCADO_TAGS: arch:ppc64 arch:or1k arch:s390x arch:x86_64 arch:rx AVOCADO_TAGS: arch:ppc64 arch:or1k arch:s390x arch:x86_64 arch:rx
arch:sh4 arch:sh4
@ -274,14 +274,14 @@ check-system-opensuse:
IMAGE: opensuse-leap IMAGE: opensuse-leap
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
avocado-system-opensuse: functional-system-opensuse:
extends: .avocado_test_job_template extends: .functional_test_job_template
needs: needs:
- job: build-system-opensuse - job: build-system-opensuse
artifacts: true artifacts: true
variables: variables:
IMAGE: opensuse-leap IMAGE: opensuse-leap
MAKE_CHECK_ARGS: check-avocado MAKE_CHECK_ARGS: check-avocado check-functional
AVOCADO_TAGS: arch:s390x arch:x86_64 arch:aarch64 AVOCADO_TAGS: arch:s390x arch:x86_64 arch:aarch64
# #
@ -302,15 +302,15 @@ build-system-flaky:
ppc64-softmmu rx-softmmu s390x-softmmu sh4-softmmu x86_64-softmmu ppc64-softmmu rx-softmmu s390x-softmmu sh4-softmmu x86_64-softmmu
MAKE_CHECK_ARGS: check-build MAKE_CHECK_ARGS: check-build
avocado-system-flaky: functional-system-flaky:
extends: .avocado_test_job_template extends: .functional_test_job_template
needs: needs:
- job: build-system-flaky - job: build-system-flaky
artifacts: true artifacts: true
allow_failure: true allow_failure: true
variables: variables:
IMAGE: debian IMAGE: debian
MAKE_CHECK_ARGS: check-avocado MAKE_CHECK_ARGS: check-avocado check-functional
QEMU_JOB_OPTIONAL: 1 QEMU_JOB_OPTIONAL: 1
QEMU_TEST_FLAKY_TESTS: 1 QEMU_TEST_FLAKY_TESTS: 1
AVOCADO_TAGS: flaky AVOCADO_TAGS: flaky
@ -485,14 +485,14 @@ check-cfi-aarch64:
IMAGE: fedora IMAGE: fedora
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
avocado-cfi-aarch64: functional-cfi-aarch64:
extends: .avocado_test_job_template extends: .functional_test_job_template
needs: needs:
- job: build-cfi-aarch64 - job: build-cfi-aarch64
artifacts: true artifacts: true
variables: variables:
IMAGE: fedora IMAGE: fedora
MAKE_CHECK_ARGS: check-avocado MAKE_CHECK_ARGS: check-avocado check-functional
build-cfi-ppc64-s390x: build-cfi-ppc64-s390x:
extends: extends:
@ -523,14 +523,14 @@ check-cfi-ppc64-s390x:
IMAGE: fedora IMAGE: fedora
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
avocado-cfi-ppc64-s390x: functional-cfi-ppc64-s390x:
extends: .avocado_test_job_template extends: .functional_test_job_template
needs: needs:
- job: build-cfi-ppc64-s390x - job: build-cfi-ppc64-s390x
artifacts: true artifacts: true
variables: variables:
IMAGE: fedora IMAGE: fedora
MAKE_CHECK_ARGS: check-avocado MAKE_CHECK_ARGS: check-avocado check-functional
build-cfi-x86_64: build-cfi-x86_64:
extends: extends:
@ -557,14 +557,14 @@ check-cfi-x86_64:
IMAGE: fedora IMAGE: fedora
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
avocado-cfi-x86_64: functional-cfi-x86_64:
extends: .avocado_test_job_template extends: .functional_test_job_template
needs: needs:
- job: build-cfi-x86_64 - job: build-cfi-x86_64
artifacts: true artifacts: true
variables: variables:
IMAGE: fedora IMAGE: fedora
MAKE_CHECK_ARGS: check-avocado MAKE_CHECK_ARGS: check-avocado check-functional
tsan-build: tsan-build:
extends: .native_build_job_template extends: .native_build_job_template