From: Alex Bennée <alex.bennee@linaro.org>
Date: Thu, 10 Dec 2020 19:04:15 +0000 (+0000)
Subject: gitlab: move --without-default-devices build from Travis
X-Git-Tag: v6.0.0-rc0~157^2~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fed93f312a8898ff391575748bdac240b477d0b;p=thirdparty%2Fqemu.git

gitlab: move --without-default-devices build from Travis

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20201210190417.31673-7-alex.bennee@linaro.org>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf3df843e2a..373d80895e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -519,6 +519,13 @@ build-trace-ust-system:
     IMAGE: ubuntu2004
     CONFIGURE_ARGS: --enable-trace-backends=ust --target-list=x86_64-softmmu
 
+# Check our reduced build configurations
+build-without-default-devices:
+  <<: *native_build_job_definition
+  variables:
+    IMAGE: centos8
+    CONFIGURE_ARGS: --without-default-devices --disable-user
+
 check-patch:
   stage: build
   image: $CI_REGISTRY_IMAGE/qemu/centos8:latest
diff --git a/.travis.yml b/.travis.yml
index d01714a5aeb..f2a101936cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -205,14 +205,6 @@ jobs:
         - ${SRC_DIR}/scripts/travis/coverage-summary.sh
 
 
-    # We manually include builds which we disable "make check" for
-    - name: "GCC without-default-devices (softmmu)"
-      env:
-        - CONFIG="--without-default-devices --disable-user"
-        - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
-        - TEST_CMD=""
-
-
     # Using newer GCC with sanitizers
     - name: "GCC9 with sanitizers (softmmu)"
       dist: bionic