[PATCH v2 6/8] gitlab: move --without-default-devices build from Travis

Alex Bennée posted 8 patches 5 years, 2 months ago
[PATCH v2 6/8] gitlab: move --without-default-devices build from Travis
Posted by Alex Bennée 5 years, 2 months ago
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
v2
  - move to centos8
---
 .gitlab-ci.yml | 7 +++++++
 .travis.yml    | 8 --------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3bcaacf7b..2134453717 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -514,6 +514,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 d01714a5ae..f2a101936c 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
-- 
2.20.1


Re: [PATCH v2 6/8] gitlab: move --without-default-devices build from Travis
Posted by Thomas Huth 5 years, 2 months ago
On 10/12/2020 20.04, Alex Bennée wrote:
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> 
> ---
> v2
>   - move to centos8
> ---
>  .gitlab-ci.yml | 7 +++++++
>  .travis.yml    | 8 --------
>  2 files changed, 7 insertions(+), 8 deletions(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>


Re: [PATCH v2 6/8] gitlab: move --without-default-devices build from Travis
Posted by Wainer dos Santos Moschetta 5 years, 2 months ago
Hi,

On 12/10/20 4:04 PM, Alex Bennée wrote:
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>
> ---
> v2
>    - move to centos8
> ---
>   .gitlab-ci.yml | 7 +++++++
>   .travis.yml    | 8 --------
>   2 files changed, 7 insertions(+), 8 deletions(-)

lgtm.

Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index b3bcaacf7b..2134453717 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -514,6 +514,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 d01714a5ae..f2a101936c 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