Really just to make my head clear. Martin Kletzander (3): ci: Consolidate refresh scripts ci: Allow failure when building fedora rawhide container Update CI files once more .gitlab-ci.yml | 1 + ci/cirrus/freebsd-12.vars | 4 +-- ci/cirrus/freebsd-13.vars | 4 +-- ci/cirrus/freebsd-current.vars | 4 +-- ci/cirrus/macos-11.vars | 2 +- ci/cirrus/refresh | 22 ---------------- 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.Dockerfile | 2 +- ci/containers/debian-sid.Dockerfile | 2 +- ci/containers/fedora-33.Dockerfile | 2 +- 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/refresh | 22 ---------------- ci/containers/ubuntu-1804.Dockerfile | 2 +- ci/containers/ubuntu-2004.Dockerfile | 2 +- ci/refresh | 27 ++++++++++++++++++++ 21 files changed, 48 insertions(+), 64 deletions(-) delete mode 100755 ci/cirrus/refresh delete mode 100755 ci/containers/refresh create mode 100755 ci/refresh -- 2.32.0
Martin Kletzander
2021-Jul-27 14:32 UTC
[Libguestfs] [libnbd PATCH 1/3] ci: Consolidate refresh scripts
And make it cleaner. Signed-off-by: Martin Kletzander <mkletzan at redhat.com> --- ci/cirrus/refresh | 22 ---------------------- ci/containers/refresh | 22 ---------------------- ci/refresh | 27 +++++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 44 deletions(-) delete mode 100755 ci/cirrus/refresh delete mode 100755 ci/containers/refresh create mode 100755 ci/refresh diff --git a/ci/cirrus/refresh b/ci/cirrus/refresh deleted file mode 100755 index 459cd80d0934..000000000000 --- a/ci/cirrus/refresh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -if test -z "$1" -then - echo "syntax: $0 PATH-TO-LCITOOL" - exit 1 -fi - -LCITOOL=$1 - -if ! test -x "$LCITOOL" -then - echo "$LCITOOL is not executable" - exit 1 -fi - -HOSTS=$($LCITOOL hosts | grep -E 'freebsd|macos') - -for host in $HOSTS -do - $LCITOOL variables "$host" libnbd >"$host.vars" -done diff --git a/ci/containers/refresh b/ci/containers/refresh deleted file mode 100755 index 7ce5332b940a..000000000000 --- a/ci/containers/refresh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -if test -z "$1" -then - echo "syntax: $0 PATH-TO-LCITOOL" - exit 1 -fi - -LCITOOL=$1 - -if ! test -x "$LCITOOL" -then - echo "$LCITOOL is not executable" - exit 1 -fi - -HOSTS=$($LCITOOL hosts | grep -Ev 'freebsd|macos') - -for host in $HOSTS -do - $LCITOOL dockerfile $host libnbd > $host.Dockerfile -done diff --git a/ci/refresh b/ci/refresh new file mode 100755 index 000000000000..dee8b0bc9713 --- /dev/null +++ b/ci/refresh @@ -0,0 +1,27 @@ +#!/bin/sh + +if test -z "$1" +then + echo "syntax: $0 PATH-TO-LCITOOL" + exit 1 +fi + +LCITOOL=$1 + +if ! test -x "$LCITOOL" +then + echo "$LCITOOL is not executable" + exit 1 +fi + +ci_path=$(dirname "$0") + +for target in $($LCITOOL targets) +do + if echo "$target" | grep -q -e 'freebsd' -e 'macos' + then + $LCITOOL variables "$target" libnbd >"$ci_path/cirrus/$target.vars" + else + $LCITOOL dockerfile "$target" libnbd >"$ci_path/containers/$target.Dockerfile" + fi +done -- 2.32.0
Martin Kletzander
2021-Jul-27 14:32 UTC
[Libguestfs] [libnbd PATCH 2/3] ci: Allow failure when building fedora rawhide container
I never really considered rawhide stable enough for too many CI jobs, although
it is nice to have some bleeding-edge updates checked as soon as possible.
However I did not want to stray away from some thought-through setup that was
done in libvirt when switching to libvirt-ci. Nevertheless Fedora Rawhide is
now not being able to build and it is not because of our wrongdoing and libvirt
switched the container building phase to allow failures, which I concur and
hence have no reason for keeping it as it was.
Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 935711e8fea3..7e8b0c574913 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,6 +137,7 @@ x64-fedora-34-container:
x64-fedora-rawhide-container:
extends: .container_job
+ allow_failure: true
variables:
NAME: fedora-rawhide
--
2.32.0
Martin Kletzander
2021-Jul-27 14:32 UTC
[Libguestfs] [libnbd PATCH 3/3] Update CI files once more
Signed-off-by: Martin Kletzander <mkletzan at redhat.com> --- ci/cirrus/freebsd-12.vars | 4 ++-- ci/cirrus/freebsd-13.vars | 4 ++-- ci/cirrus/freebsd-current.vars | 4 ++-- 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.Dockerfile | 2 +- ci/containers/debian-sid.Dockerfile | 2 +- ci/containers/fedora-33.Dockerfile | 2 +- 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 +- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 7d07d0d7a751..721c627af0a1 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -2,12 +2,12 @@ # # $ lcitool variables freebsd-12 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 PACKAGING_COMMAND='pkg' CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' -PIP3='/usr/local/bin/pip-3.7' +PIP3='/usr/local/bin/pip-3.8' PKGS='autoconf automake bash-completion ca_root_nss ccache diffutils fusefs-libs3 git glib gmake gnutls go gsed jq libev libtool libxml2 nbd-server nbdkit ocaml ocaml-findlib p5-Pod-Simple perl5 pkgconf py38-flake8 python3 qemu valgrind' diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index 538dbeae06f8..ce43238c7a9f 100644 --- a/ci/cirrus/freebsd-13.vars +++ b/ci/cirrus/freebsd-13.vars @@ -2,12 +2,12 @@ # # $ lcitool variables freebsd-13 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 PACKAGING_COMMAND='pkg' CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' -PIP3='/usr/local/bin/pip-3.7' +PIP3='/usr/local/bin/pip-3.8' PKGS='autoconf automake bash-completion ca_root_nss ccache diffutils fusefs-libs3 git glib gmake gnutls go gsed jq libev libtool libxml2 nbd-server nbdkit ocaml ocaml-findlib p5-Pod-Simple perl5 pkgconf py38-flake8 python3 qemu valgrind' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index b0b0c23b6b24..e8b58a515836 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -2,12 +2,12 @@ # # $ lcitool variables freebsd-current libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 PACKAGING_COMMAND='pkg' CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PYTHON='/usr/local/bin/python3' -PIP3='/usr/local/bin/pip-3.7' +PIP3='/usr/local/bin/pip-3.8' PKGS='autoconf automake bash-completion ca_root_nss ccache diffutils fusefs-libs3 git glib gmake gnutls go gsed jq libev libtool libxml2 nbd-server nbdkit ocaml ocaml-findlib p5-Pod-Simple perl5 pkgconf py38-flake8 python3 qemu valgrind' diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index 53ea348c0130..691917d16de0 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -2,7 +2,7 @@ # # $ lcitool variables macos-11 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 PACKAGING_COMMAND='brew' CCACHE='/usr/local/bin/ccache' diff --git a/ci/containers/alpine-314.Dockerfile b/ci/containers/alpine-314.Dockerfile index c9ae76e7120b..f818f27ef354 100644 --- a/ci/containers/alpine-314.Dockerfile +++ b/ci/containers/alpine-314.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile alpine-314 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 FROM docker.io/library/alpine:3.14 diff --git a/ci/containers/alpine-edge.Dockerfile b/ci/containers/alpine-edge.Dockerfile index 4512e44252b5..d59ed0141513 100644 --- a/ci/containers/alpine-edge.Dockerfile +++ b/ci/containers/alpine-edge.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile alpine-edge libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 FROM docker.io/library/alpine:edge diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile index bb4457294fb3..ac1079a47f04 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-8 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 FROM docker.io/library/centos:8 diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile index 051aba4ec1ee..29be6ed4c1fd 100644 --- a/ci/containers/centos-stream-8.Dockerfile +++ b/ci/containers/centos-stream-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-stream-8 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 FROM quay.io/centos/centos:stream8 diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile index 992b2c86911e..0d039359223e 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-10 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 FROM docker.io/library/debian:10-slim diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index 38819625d436..fe8f49524639 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-sid libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 FROM docker.io/library/debian:sid-slim diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile index 177df083453d..3383762b3a5b 100644 --- a/ci/containers/fedora-33.Dockerfile +++ b/ci/containers/fedora-33.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-33 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 FROM registry.fedoraproject.org/fedora:33 diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.Dockerfile index b3aac697a1a0..f2bfba91e94e 100644 --- a/ci/containers/fedora-34.Dockerfile +++ b/ci/containers/fedora-34.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-34 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 FROM registry.fedoraproject.org/fedora:34 diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 5922c6863af2..40d45bd386c5 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-rawhide libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 FROM registry.fedoraproject.org/fedora:rawhide diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile index dda15b7e627f..86e7171702a2 100644 --- a/ci/containers/opensuse-leap-152.Dockerfile +++ b/ci/containers/opensuse-leap-152.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile opensuse-leap-152 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 FROM registry.opensuse.org/opensuse/leap:15.2 diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index 22af9e533376..004794743c23 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile opensuse-tumbleweed libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 FROM registry.opensuse.org/opensuse/tumbleweed:latest diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile index 42c4ae400d43..624b4381d8b6 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-1804 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 FROM docker.io/library/ubuntu:18.04 diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile index e40427c3125e..e6e04391b7d5 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-2004 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/1b32d74a089da43a0f79eba012ad04c30b57ecc6 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 FROM docker.io/library/ubuntu:20.04 -- 2.32.0