1. Patchew
  2. QEMU
  3. View series

[PATCH] shippable.yml: Remove jobs duplicated on Gitlab-CI

Philippe Mathieu-Daudé posted 1 patch 5 years ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20210108145103.269353-1-f4bug@amsat.org
.shippable.yml | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
[PATCH] shippable.yml: Remove jobs duplicated on Gitlab-CI
Posted by Philippe Mathieu-Daudé 5 years ago 
The following jobs are duplicated on Gitlab-CI since commit
6bcb5fc0f7a ("gitlab-ci: Add cross-compiling build tests"):

- IMAGE=debian-armel-cross

  TARGET_LIST=arm-softmmu               -> cross-armel-system
  TARGET_LIST=arm-linux-user            -> cross-armel-user
  TARGET_LIST=armeb-linux-user          -> cross-armel-user

- IMAGE=debian-armhf-cross

  TARGET_LIST=arm-softmmu               -> cross-armhf-system
  TARGET_LIST=arm-linux-user            -> cross-armhf-user
  TARGET_LIST=armeb-linux-user          -> cross-armhf-user

- IMAGE=debian-arm64-cross

  TARGET_LIST=aarch64-softmmu           -> cross-arm64-system
  TARGET_LIST=aarch64-linux-user        -> cross-arm64-user

- IMAGE=debian-s390x-cross

  TARGET_LIST=s390x-softmmu             -> cross-s390x-system
  TARGET_LIST=s390x-linux-user          -> cross-s390x-user

- IMAGE=debian-mips-cross

  TARGET_LIST=mipsel-linux-user         -> cross-mips-user

- IMAGE=debian-mips64el-cross

  TARGET_LIST=mips64el-softmmu          -> cross-mips64el-system
  TARGET_LIST=mips64el-linux-user       -> cross-mips64el-user

- IMAGE=debian-ppc64el-cross

  TARGET_LIST=ppc64-softmmu             -> cross-ppc64el-system
  TARGET_LIST=ppc64-linux-user          -> cross-ppc64el-user
  TARGET_LIST=ppc64abi32-linux-user     -> cross-ppc64el-user

Remove them from Shippable CI.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 .shippable.yml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/.shippable.yml b/.shippable.yml
index 14350e6de8a..97bfa2a0f38 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -7,20 +7,8 @@ env:
   matrix:
     - IMAGE=debian-amd64
       TARGET_LIST=x86_64-softmmu,x86_64-linux-user
-    - IMAGE=debian-armel-cross
-      TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user
-    - IMAGE=debian-armhf-cross
-      TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user
-    - IMAGE=debian-arm64-cross
-      TARGET_LIST=aarch64-softmmu,aarch64-linux-user
-    - IMAGE=debian-s390x-cross
-      TARGET_LIST=s390x-softmmu,s390x-linux-user
     - IMAGE=debian-mips-cross
-      TARGET_LIST=mips-softmmu,mipsel-linux-user
-    - IMAGE=debian-mips64el-cross
-      TARGET_LIST=mips64el-softmmu,mips64el-linux-user
-    - IMAGE=debian-ppc64el-cross
-      TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user
+      TARGET_LIST=mips-softmmu
 build:
   pre_ci_boot:
     image_name: registry.gitlab.com/qemu-project/qemu/qemu/${IMAGE}
-- 
2.26.2
Re: [PATCH] shippable.yml: Remove jobs duplicated on Gitlab-CI
Posted by Paolo Bonzini 5 years ago 
On 08/01/21 15:51, Philippe Mathieu-Daudé wrote:
> The following jobs are duplicated on Gitlab-CI since commit
> 6bcb5fc0f7a ("gitlab-ci: Add cross-compiling build tests"):
> 
> - IMAGE=debian-armel-cross
> 
>    TARGET_LIST=arm-softmmu               -> cross-armel-system
>    TARGET_LIST=arm-linux-user            -> cross-armel-user
>    TARGET_LIST=armeb-linux-user          -> cross-armel-user
> 
> - IMAGE=debian-armhf-cross
> 
>    TARGET_LIST=arm-softmmu               -> cross-armhf-system
>    TARGET_LIST=arm-linux-user            -> cross-armhf-user
>    TARGET_LIST=armeb-linux-user          -> cross-armhf-user
> 
> - IMAGE=debian-arm64-cross
> 
>    TARGET_LIST=aarch64-softmmu           -> cross-arm64-system
>    TARGET_LIST=aarch64-linux-user        -> cross-arm64-user
> 
> - IMAGE=debian-s390x-cross
> 
>    TARGET_LIST=s390x-softmmu             -> cross-s390x-system
>    TARGET_LIST=s390x-linux-user          -> cross-s390x-user
> 
> - IMAGE=debian-mips-cross
> 
>    TARGET_LIST=mipsel-linux-user         -> cross-mips-user
> 
> - IMAGE=debian-mips64el-cross
> 
>    TARGET_LIST=mips64el-softmmu          -> cross-mips64el-system
>    TARGET_LIST=mips64el-linux-user       -> cross-mips64el-user
> 
> - IMAGE=debian-ppc64el-cross
> 
>    TARGET_LIST=ppc64-softmmu             -> cross-ppc64el-system
>    TARGET_LIST=ppc64-linux-user          -> cross-ppc64el-user
>    TARGET_LIST=ppc64abi32-linux-user     -> cross-ppc64el-user
> 
> Remove them from Shippable CI.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>   .shippable.yml | 14 +-------------
>   1 file changed, 1 insertion(+), 13 deletions(-)
> 
> diff --git a/.shippable.yml b/.shippable.yml
> index 14350e6de8a..97bfa2a0f38 100644
> --- a/.shippable.yml
> +++ b/.shippable.yml
> @@ -7,20 +7,8 @@ env:
>     matrix:
>       - IMAGE=debian-amd64
>         TARGET_LIST=x86_64-softmmu,x86_64-linux-user
> -    - IMAGE=debian-armel-cross
> -      TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user
> -    - IMAGE=debian-armhf-cross
> -      TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user
> -    - IMAGE=debian-arm64-cross
> -      TARGET_LIST=aarch64-softmmu,aarch64-linux-user
> -    - IMAGE=debian-s390x-cross
> -      TARGET_LIST=s390x-softmmu,s390x-linux-user
>       - IMAGE=debian-mips-cross
> -      TARGET_LIST=mips-softmmu,mipsel-linux-user
> -    - IMAGE=debian-mips64el-cross
> -      TARGET_LIST=mips64el-softmmu,mips64el-linux-user
> -    - IMAGE=debian-ppc64el-cross
> -      TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user
> +      TARGET_LIST=mips-softmmu

The debian-mips-cross/mips-softmmu pair (and also mipsel-softmmu) is 
currently excluded by Gitlab's cross-mips-system, is there a reason for 
that?  If we add it there, we can just remove shippable altogether.

Paolo
Re: [PATCH] shippable.yml: Remove jobs duplicated on Gitlab-CI
Posted by Daniel P. Berrangé 5 years ago 
On Fri, Jan 08, 2021 at 04:14:30PM +0100, Paolo Bonzini wrote:
> On 08/01/21 15:51, Philippe Mathieu-Daudé wrote:
> > The following jobs are duplicated on Gitlab-CI since commit
> > 6bcb5fc0f7a ("gitlab-ci: Add cross-compiling build tests"):
> > 
> > - IMAGE=debian-armel-cross
> > 
> >    TARGET_LIST=arm-softmmu               -> cross-armel-system
> >    TARGET_LIST=arm-linux-user            -> cross-armel-user
> >    TARGET_LIST=armeb-linux-user          -> cross-armel-user
> > 
> > - IMAGE=debian-armhf-cross
> > 
> >    TARGET_LIST=arm-softmmu               -> cross-armhf-system
> >    TARGET_LIST=arm-linux-user            -> cross-armhf-user
> >    TARGET_LIST=armeb-linux-user          -> cross-armhf-user
> > 
> > - IMAGE=debian-arm64-cross
> > 
> >    TARGET_LIST=aarch64-softmmu           -> cross-arm64-system
> >    TARGET_LIST=aarch64-linux-user        -> cross-arm64-user
> > 
> > - IMAGE=debian-s390x-cross
> > 
> >    TARGET_LIST=s390x-softmmu             -> cross-s390x-system
> >    TARGET_LIST=s390x-linux-user          -> cross-s390x-user
> > 
> > - IMAGE=debian-mips-cross
> > 
> >    TARGET_LIST=mipsel-linux-user         -> cross-mips-user
> > 
> > - IMAGE=debian-mips64el-cross
> > 
> >    TARGET_LIST=mips64el-softmmu          -> cross-mips64el-system
> >    TARGET_LIST=mips64el-linux-user       -> cross-mips64el-user
> > 
> > - IMAGE=debian-ppc64el-cross
> > 
> >    TARGET_LIST=ppc64-softmmu             -> cross-ppc64el-system
> >    TARGET_LIST=ppc64-linux-user          -> cross-ppc64el-user
> >    TARGET_LIST=ppc64abi32-linux-user     -> cross-ppc64el-user
> > 
> > Remove them from Shippable CI.
> > 
> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > ---
> >   .shippable.yml | 14 +-------------
> >   1 file changed, 1 insertion(+), 13 deletions(-)
> > 
> > diff --git a/.shippable.yml b/.shippable.yml
> > index 14350e6de8a..97bfa2a0f38 100644
> > --- a/.shippable.yml
> > +++ b/.shippable.yml
> > @@ -7,20 +7,8 @@ env:
> >     matrix:
> >       - IMAGE=debian-amd64
> >         TARGET_LIST=x86_64-softmmu,x86_64-linux-user
> > -    - IMAGE=debian-armel-cross
> > -      TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user
> > -    - IMAGE=debian-armhf-cross
> > -      TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user
> > -    - IMAGE=debian-arm64-cross
> > -      TARGET_LIST=aarch64-softmmu,aarch64-linux-user
> > -    - IMAGE=debian-s390x-cross
> > -      TARGET_LIST=s390x-softmmu,s390x-linux-user
> >       - IMAGE=debian-mips-cross
> > -      TARGET_LIST=mips-softmmu,mipsel-linux-user
> > -    - IMAGE=debian-mips64el-cross
> > -      TARGET_LIST=mips64el-softmmu,mips64el-linux-user
> > -    - IMAGE=debian-ppc64el-cross
> > -      TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user
> > +      TARGET_LIST=mips-softmmu
> 
> The debian-mips-cross/mips-softmmu pair (and also mipsel-softmmu) is
> currently excluded by Gitlab's cross-mips-system, is there a reason for
> that?  If we add it there, we can just remove shippable altogether.

Some softmmu targets were disable to keep the build time under control.

We could enable a different subset of targets for each cross host arch,
so that overall we get representative coverage of the full set.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
Re: [PATCH] shippable.yml: Remove jobs duplicated on Gitlab-CI
Posted by Paolo Bonzini 5 years ago 
On 08/01/21 16:21, Daniel P. Berrangé wrote:
> On Fri, Jan 08, 2021 at 04:14:30PM +0100, Paolo Bonzini wrote:
>> On 08/01/21 15:51, Philippe Mathieu-Daudé wrote:
>>> The following jobs are duplicated on Gitlab-CI since commit
>>> 6bcb5fc0f7a ("gitlab-ci: Add cross-compiling build tests"):
>>>
>>> - IMAGE=debian-armel-cross
>>>
>>>     TARGET_LIST=arm-softmmu               -> cross-armel-system
>>>     TARGET_LIST=arm-linux-user            -> cross-armel-user
>>>     TARGET_LIST=armeb-linux-user          -> cross-armel-user
>>>
>>> - IMAGE=debian-armhf-cross
>>>
>>>     TARGET_LIST=arm-softmmu               -> cross-armhf-system
>>>     TARGET_LIST=arm-linux-user            -> cross-armhf-user
>>>     TARGET_LIST=armeb-linux-user          -> cross-armhf-user
>>>
>>> - IMAGE=debian-arm64-cross
>>>
>>>     TARGET_LIST=aarch64-softmmu           -> cross-arm64-system
>>>     TARGET_LIST=aarch64-linux-user        -> cross-arm64-user
>>>
>>> - IMAGE=debian-s390x-cross
>>>
>>>     TARGET_LIST=s390x-softmmu             -> cross-s390x-system
>>>     TARGET_LIST=s390x-linux-user          -> cross-s390x-user
>>>
>>> - IMAGE=debian-mips-cross
>>>
>>>     TARGET_LIST=mipsel-linux-user         -> cross-mips-user
>>>
>>> - IMAGE=debian-mips64el-cross
>>>
>>>     TARGET_LIST=mips64el-softmmu          -> cross-mips64el-system
>>>     TARGET_LIST=mips64el-linux-user       -> cross-mips64el-user
>>>
>>> - IMAGE=debian-ppc64el-cross
>>>
>>>     TARGET_LIST=ppc64-softmmu             -> cross-ppc64el-system
>>>     TARGET_LIST=ppc64-linux-user          -> cross-ppc64el-user
>>>     TARGET_LIST=ppc64abi32-linux-user     -> cross-ppc64el-user
>>>
>>> Remove them from Shippable CI.
>>>
>>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>> ---
>>>    .shippable.yml | 14 +-------------
>>>    1 file changed, 1 insertion(+), 13 deletions(-)
>>>
>>> diff --git a/.shippable.yml b/.shippable.yml
>>> index 14350e6de8a..97bfa2a0f38 100644
>>> --- a/.shippable.yml
>>> +++ b/.shippable.yml
>>> @@ -7,20 +7,8 @@ env:
>>>      matrix:
>>>        - IMAGE=debian-amd64
>>>          TARGET_LIST=x86_64-softmmu,x86_64-linux-user
>>> -    - IMAGE=debian-armel-cross
>>> -      TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user
>>> -    - IMAGE=debian-armhf-cross
>>> -      TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user
>>> -    - IMAGE=debian-arm64-cross
>>> -      TARGET_LIST=aarch64-softmmu,aarch64-linux-user
>>> -    - IMAGE=debian-s390x-cross
>>> -      TARGET_LIST=s390x-softmmu,s390x-linux-user
>>>        - IMAGE=debian-mips-cross
>>> -      TARGET_LIST=mips-softmmu,mipsel-linux-user
>>> -    - IMAGE=debian-mips64el-cross
>>> -      TARGET_LIST=mips64el-softmmu,mips64el-linux-user
>>> -    - IMAGE=debian-ppc64el-cross
>>> -      TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user
>>> +      TARGET_LIST=mips-softmmu
>>
>> The debian-mips-cross/mips-softmmu pair (and also mipsel-softmmu) is
>> currently excluded by Gitlab's cross-mips-system, is there a reason for
>> that?  If we add it there, we can just remove shippable altogether.
> 
> Some softmmu targets were disable to keep the build time under control.
> 
> We could enable a different subset of targets for each cross host arch,
> so that overall we get representative coverage of the full set.

Right, but at least KVM targets ought to be included in their own cross 
host.

Paolo
Re: [PATCH] shippable.yml: Remove jobs duplicated on Gitlab-CI
Posted by Philippe Mathieu-Daudé 5 years ago 
On 1/8/21 4:36 PM, Paolo Bonzini wrote:
> On 08/01/21 16:21, Daniel P. Berrangé wrote:
>> On Fri, Jan 08, 2021 at 04:14:30PM +0100, Paolo Bonzini wrote:
...
>>>
>>> The debian-mips-cross/mips-softmmu pair (and also mipsel-softmmu) is
>>> currently excluded by Gitlab's cross-mips-system, is there a reason for
>>> that?  If we add it there, we can just remove shippable altogether.

Can we get this cleaned one step at a time? :)

>> Some softmmu targets were disable to keep the build time under control.
>>
>> We could enable a different subset of targets for each cross host arch,
>> so that overall we get representative coverage of the full set.
> 
> Right, but at least KVM targets ought to be included in their own cross
> host.
> 
> Paolo
>
Re: [PATCH] shippable.yml: Remove jobs duplicated on Gitlab-CI
Posted by Alex Bennée 5 years ago 
Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> The following jobs are duplicated on Gitlab-CI since commit
> 6bcb5fc0f7a ("gitlab-ci: Add cross-compiling build tests"):
>
> - IMAGE=debian-armel-cross
>
>   TARGET_LIST=arm-softmmu               -> cross-armel-system
>   TARGET_LIST=arm-linux-user            -> cross-armel-user
>   TARGET_LIST=armeb-linux-user          -> cross-armel-user
>
> - IMAGE=debian-armhf-cross
>
>   TARGET_LIST=arm-softmmu               -> cross-armhf-system
>   TARGET_LIST=arm-linux-user            -> cross-armhf-user
>   TARGET_LIST=armeb-linux-user          -> cross-armhf-user
>
> - IMAGE=debian-arm64-cross
>
>   TARGET_LIST=aarch64-softmmu           -> cross-arm64-system
>   TARGET_LIST=aarch64-linux-user        -> cross-arm64-user
>
> - IMAGE=debian-s390x-cross
>
>   TARGET_LIST=s390x-softmmu             -> cross-s390x-system
>   TARGET_LIST=s390x-linux-user          -> cross-s390x-user
>
> - IMAGE=debian-mips-cross
>
>   TARGET_LIST=mipsel-linux-user         -> cross-mips-user
>
> - IMAGE=debian-mips64el-cross
>
>   TARGET_LIST=mips64el-softmmu          -> cross-mips64el-system
>   TARGET_LIST=mips64el-linux-user       -> cross-mips64el-user
>
> - IMAGE=debian-ppc64el-cross
>
>   TARGET_LIST=ppc64-softmmu             -> cross-ppc64el-system
>   TARGET_LIST=ppc64-linux-user          -> cross-ppc64el-user
>   TARGET_LIST=ppc64abi32-linux-user     -> cross-ppc64el-user
>
> Remove them from Shippable CI.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  .shippable.yml | 14 +-------------
>  1 file changed, 1 insertion(+), 13 deletions(-)
>
> diff --git a/.shippable.yml b/.shippable.yml
> index 14350e6de8a..97bfa2a0f38 100644
> --- a/.shippable.yml
> +++ b/.shippable.yml
> @@ -7,20 +7,8 @@ env:
>    matrix:
>      - IMAGE=debian-amd64
>        TARGET_LIST=x86_64-softmmu,x86_64-linux-user
> -    - IMAGE=debian-armel-cross
> -      TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user
> -    - IMAGE=debian-armhf-cross
> -      TARGET_LIST=arm-softmmu,arm-linux-user,armeb-linux-user
> -    - IMAGE=debian-arm64-cross
> -      TARGET_LIST=aarch64-softmmu,aarch64-linux-user
> -    - IMAGE=debian-s390x-cross
> -      TARGET_LIST=s390x-softmmu,s390x-linux-user
>      - IMAGE=debian-mips-cross
> -      TARGET_LIST=mips-softmmu,mipsel-linux-user
> -    - IMAGE=debian-mips64el-cross
> -      TARGET_LIST=mips64el-softmmu,mips64el-linux-user
> -    - IMAGE=debian-ppc64el-cross
> -      TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user
> +      TARGET_LIST=mips-softmmu
>  build:
>    pre_ci_boot:
>      image_name: registry.gitlab.com/qemu-project/qemu/qemu/${IMAGE}

Acked-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée
Re: [PATCH] shippable.yml: Remove jobs duplicated on Gitlab-CI
Posted by Alex Bennée 5 years ago 
Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> The following jobs are duplicated on Gitlab-CI since commit
> 6bcb5fc0f7a ("gitlab-ci: Add cross-compiling build tests"):

Queued to testing/next, thanks.

-- 
Alex Bennée

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.