From d1a8b308a4ceb1071683bfcee22bd646b251f4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Sun, 8 Nov 2020 21:45:30 +0100 Subject: [PATCH] gitlab-ci: Move coroutine tests across to gitlab MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Similarly to commit 8cdb2cef3f1, move the coroutine tests to GitLab. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20201108204535.2319870-13-philmd@redhat.com> Reviewed-by: Wainer dos Santos Moschetta [thuth: Replaced Travis by Gitlab-CI in comment] Signed-off-by: Thomas Huth --- .gitlab-ci.yml | 16 ++++++++++++++++ .travis.yml | 14 -------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7381c7858d..873ed19fcf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -413,6 +413,22 @@ build-tci: - QTEST_QEMU_BINARY="./qemu-system-x86_64" ./tests/qtest/pxe-test - QTEST_QEMU_BINARY="./qemu-system-s390x" ./tests/qtest/pxe-test -m slow +# 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 +build-coroutine-ucontext: + <<: *native_build_job_definition + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --with-coroutine=ucontext --disable-tcg + MAKE_CHECK_ARGS: check-unit + +build-coroutine-sigaltstack: + <<: *native_build_job_definition + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --with-coroutine=sigaltstack --disable-tcg + MAKE_CHECK_ARGS: check-unit + # Most jobs test latest gcrypt or nettle builds # # These jobs test old gcrypt and nettle from RHEL7 diff --git a/.travis.yml b/.travis.yml index 12828f351c..d01714a5ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -148,20 +148,6 @@ jobs: - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" - # Alternate coroutines implementations are only really of interest to KVM users - # However we can't test against KVM on Travis so we can only run unit tests - - name: "check-unit coroutine=ucontext" - env: - - CONFIG="--with-coroutine=ucontext --disable-tcg" - - TEST_CMD="make check-unit -j${JOBS} V=1" - - - - name: "check-unit coroutine=sigaltstack" - env: - - CONFIG="--with-coroutine=sigaltstack --disable-tcg" - - TEST_CMD="make check-unit -j${JOBS} V=1" - - # Check we can build docs and tools (out of tree) - name: "tools and docs (bionic)" dist: bionic