[Libguestfs] [libnbd PATCH] ci: Adopt libvirt-ci's manifest approach

Daniel P. Berrangé berrange at redhat.com
Thu Sep 23 14:58:56 UTC 2021


On Thu, Sep 23, 2021 at 04:40:59PM +0200, Martin Kletzander wrote:
> This makes it a bit easier to write .gitlab-ci.yml as it inherits most of what
> can be generated from the ci/gitlab.yml and deprecates the ci/refresh script.
> 
> Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
> ---
>  .gitlab-ci.yml                                | 270 +-----------
>  ci/README.rst                                 |   7 +-
>  ci/cirrus/freebsd-12.vars                     |   2 +-
>  ci/cirrus/freebsd-13.vars                     |   2 +-
>  ci/cirrus/freebsd-current.vars                |   2 +-
>  ci/cirrus/macos-11.vars                       |   2 +-
>  ci/containers/alpine-314.Dockerfile           |   2 +-
>  ci/containers/alpine-edge.Dockerfile          |   2 +-
>  ci/containers/centos-8.Dockerfile             |   2 +-
>  ci/containers/centos-stream-8.Dockerfile      |   2 +-
>  ci/containers/debian-10-cross-i686.Dockerfile |   2 +-
>  ci/containers/debian-10.Dockerfile            |   2 +-
>  ci/containers/debian-11-cross-i686.Dockerfile |   2 +-
>  ci/containers/debian-11.Dockerfile            |   2 +-
>  ci/containers/debian-sid.Dockerfile           |   2 +-
>  ci/containers/fedora-33.Dockerfile            |   2 +-
>  ci/containers/fedora-34-cross-i686.Dockerfile |   0
>  ci/containers/fedora-34.Dockerfile            |   2 +-
>  ci/containers/fedora-rawhide.Dockerfile       |   2 +-
>  ci/containers/opensuse-leap-152.Dockerfile    |   2 +-
>  ci/containers/opensuse-tumbleweed.Dockerfile  |   2 +-
>  ci/containers/ubuntu-1804.Dockerfile          |   2 +-
>  ci/containers/ubuntu-2004.Dockerfile          |   2 +-
>  ci/gitlab.yml                                 | 413 ++++++++++++++++++
>  ci/manifest.yml                               |  72 +++
>  ci/refresh                                    |  33 --
>  26 files changed, 520 insertions(+), 315 deletions(-)
>  delete mode 100644 ci/containers/fedora-34-cross-i686.Dockerfile
>  create mode 100644 ci/gitlab.yml
>  create mode 100644 ci/manifest.yml
>  delete mode 100755 ci/refresh

> diff --git a/ci/manifest.yml b/ci/manifest.yml
> new file mode 100644
> index 000000000000..2439ed01eea2
> --- /dev/null
> +++ b/ci/manifest.yml
> @@ -0,0 +1,72 @@
> +projects:
> +  - libnbd
> +
> +gitlab:
> +  namespace: nbdkit
> +  project: libnbd
> +  jobs:
> +    check-dco: false
> +
> +targets:
> +  alpine-314: x86_64
> +
> +  alpine-edge: x86_64
> +
> +  centos-8:
> +    jobs:
> +      - arch: x86_64
> +
> +      - arch: x86_64
> +        suffix: -clang
> +        variables:
> +          CC: clang
> +
> +  centos-stream-8: x86_64
> +
> +  debian-10:
> +    jobs:
> +      - arch: x86_64
> +      - arch: i686
> +
> +  debian-11:
> +    jobs:
> +      - arch: x86_64
> +      - arch: i686
> +
> +  debian-sid: x86_64
> +
> +  fedora-33: x86_64
> +
> +  fedora-34: x86_64
> +
> +  fedora-rawhide:
> +    jobs:
> +      - arch: x86_64
> +
> +      - arch: x86_64
> +        suffix: -clang
> +        variables:
> +          CC: clang
> +
> +  freebsd-12: x86_64
> +
> +  freebsd-13: x86_64
> +
> +  freebsd-current: x86_64
> +
> +  opensuse-leap-152: x86_64
> +
> +  opensuse-tumbleweed: x86_64
> +
> +  macos-11:
> +    jobs:
> +      - arch: x86_64
> +        variables:
> +          PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
> +          PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
> +
> +  ubuntu-1804: x86_64
> +
> +  ubuntu-2004:
> +    jobs:
> +      - arch: x86_64

Can be simplified like the ubuntu-1804 def

Reviewed-by: Daniel P. Berrangé <berrange at redhat.com>



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 :|




More information about the Libguestfs mailing list