In this refresh CentOS 7 now uses docker.io registry and the PowerTools repo name regression was fixed for CentOS Stream this time. Signed-off-by: Erik Skultety <eskultet@redhat.com> --- ci/containers/ci-centos-7.Dockerfile | 4 ++-- ci/containers/ci-centos-8.Dockerfile | 2 +- ci/containers/ci-centos-stream.Dockerfile | 9 +++++---- ci/containers/ci-debian-10-cross-aarch64.Dockerfile | 2 +- ci/containers/ci-debian-10-cross-armv6l.Dockerfile | 2 +- ci/containers/ci-debian-10-cross-armv7l.Dockerfile | 2 +- ci/containers/ci-debian-10-cross-i686.Dockerfile | 2 +- ci/containers/ci-debian-10-cross-mips.Dockerfile | 4 ++-- ci/containers/ci-debian-10-cross-mips64el.Dockerfile | 2 +- ci/containers/ci-debian-10-cross-mipsel.Dockerfile | 2 +- ci/containers/ci-debian-10-cross-ppc64le.Dockerfile | 2 +- ci/containers/ci-debian-10-cross-s390x.Dockerfile | 4 ++-- ci/containers/ci-debian-10.Dockerfile | 2 +- ci/containers/ci-debian-sid-cross-aarch64.Dockerfile | 2 +- ci/containers/ci-debian-sid-cross-armv6l.Dockerfile | 2 +- ci/containers/ci-debian-sid-cross-armv7l.Dockerfile | 2 +- ci/containers/ci-debian-sid-cross-i686.Dockerfile | 2 +- ci/containers/ci-debian-sid-cross-mips64el.Dockerfile | 2 +- ci/containers/ci-debian-sid-cross-mipsel.Dockerfile | 2 +- ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile | 2 +- ci/containers/ci-debian-sid-cross-s390x.Dockerfile | 4 ++-- ci/containers/ci-debian-sid.Dockerfile | 2 +- ci/containers/ci-fedora-32.Dockerfile | 2 +- ci/containers/ci-fedora-33.Dockerfile | 2 +- ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile | 2 +- ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile | 2 +- ci/containers/ci-fedora-rawhide.Dockerfile | 2 +- ci/containers/ci-ubuntu-1804.Dockerfile | 2 +- ci/containers/ci-ubuntu-2004.Dockerfile | 2 +- 29 files changed, 37 insertions(+), 36 deletions(-) diff --git a/ci/containers/ci-centos-7.Dockerfile b/ci/containers/ci-centos-7.Dockerfile index 39ec95ca55..a40b9d158c 100644 --- a/ci/containers/ci-centos-7.Dockerfile +++ b/ci/containers/ci-centos-7.Dockerfile @@ -2,8 +2,8 @@ # # $ lcitool dockerfile centos-7 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... -FROM registry.centos.org/centos:7 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... +FROM docker.io/library/centos:7 RUN yum update -y && \ echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \ diff --git a/ci/containers/ci-centos-8.Dockerfile b/ci/containers/ci-centos-8.Dockerfile index 8f240d2a33..551401635f 100644 --- a/ci/containers/ci-centos-8.Dockerfile +++ b/ci/containers/ci-centos-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-8 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/centos:8 RUN dnf update -y && \ diff --git a/ci/containers/ci-centos-stream.Dockerfile b/ci/containers/ci-centos-stream.Dockerfile index 141b378438..868e8a4486 100644 --- a/ci/containers/ci-centos-stream.Dockerfile +++ b/ci/containers/ci-centos-stream.Dockerfile @@ -2,13 +2,14 @@ # # $ lcitool dockerfile centos-stream libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/centos:8 -RUN dnf update -y && \ - dnf install -y centos-release-stream && \ +RUN dnf install -y centos-release-stream && \ + dnf install -y centos-stream-release && \ + dnf update -y && \ dnf install 'dnf-command(config-manager)' -y && \ - dnf config-manager --set-enabled -y Stream-PowerTools && \ + dnf config-manager --set-enabled -y powertools && \ dnf install -y centos-release-advanced-virtualization && \ dnf install -y epel-release && \ dnf install -y \ diff --git a/ci/containers/ci-debian-10-cross-aarch64.Dockerfile b/ci/containers/ci-debian-10-cross-aarch64.Dockerfile index a8ec0ad135..6ae1d3c390 100644 --- a/ci/containers/ci-debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/ci-debian-10-cross-aarch64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross aarch64 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-debian-10-cross-armv6l.Dockerfile b/ci/containers/ci-debian-10-cross-armv6l.Dockerfile index cfb1a61585..b099245bf1 100644 --- a/ci/containers/ci-debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/ci-debian-10-cross-armv6l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv6l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-debian-10-cross-armv7l.Dockerfile b/ci/containers/ci-debian-10-cross-armv7l.Dockerfile index 06e2472498..bae0fc7f80 100644 --- a/ci/containers/ci-debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/ci-debian-10-cross-armv7l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv7l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-debian-10-cross-i686.Dockerfile b/ci/containers/ci-debian-10-cross-i686.Dockerfile index 27dbc1ba97..94b3a85d16 100644 --- a/ci/containers/ci-debian-10-cross-i686.Dockerfile +++ b/ci/containers/ci-debian-10-cross-i686.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross i686 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-debian-10-cross-mips.Dockerfile b/ci/containers/ci-debian-10-cross-mips.Dockerfile index 596a1f9d6b..07a22f80ec 100644 --- a/ci/containers/ci-debian-10-cross-mips.Dockerfile +++ b/ci/containers/ci-debian-10-cross-mips.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -112,7 +112,7 @@ pkgconfig = '/usr/bin/mips-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'mips'\n\ cpu = 'mips'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mips-linux-gnu +endian = 'big'" > /usr/local/share/meson/cross/mips-linux-gnu RUN pip3 install \ meson==0.54.0 diff --git a/ci/containers/ci-debian-10-cross-mips64el.Dockerfile b/ci/containers/ci-debian-10-cross-mips64el.Dockerfile index b71619811f..9bb278e33e 100644 --- a/ci/containers/ci-debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/ci-debian-10-cross-mips64el.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips64el debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-debian-10-cross-mipsel.Dockerfile b/ci/containers/ci-debian-10-cross-mipsel.Dockerfile index b45112f3bc..b912b096ba 100644 --- a/ci/containers/ci-debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/ci-debian-10-cross-mipsel.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mipsel debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile b/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile index 9b833fdd4d..8f2098db5f 100644 --- a/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross ppc64le debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-debian-10-cross-s390x.Dockerfile b/ci/containers/ci-debian-10-cross-s390x.Dockerfile index 1a324e7e08..5c4f61f188 100644 --- a/ci/containers/ci-debian-10-cross-s390x.Dockerfile +++ b/ci/containers/ci-debian-10-cross-s390x.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross s390x debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -112,7 +112,7 @@ pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 's390x'\n\ cpu = 's390x'\n\ -endian = 'little'" > /usr/local/share/meson/cross/s390x-linux-gnu +endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu RUN pip3 install \ meson==0.54.0 diff --git a/ci/containers/ci-debian-10.Dockerfile b/ci/containers/ci-debian-10.Dockerfile index ac8a35e175..92ae3e6e0f 100644 --- a/ci/containers/ci-debian-10.Dockerfile +++ b/ci/containers/ci-debian-10.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile b/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile index c46012b5af..bd3ed32017 100644 --- a/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross aarch64 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile b/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile index f61bfc5009..1032cd91fc 100644 --- a/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv6l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile b/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile index 89e62f1ab3..01eb0dd51a 100644 --- a/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv7l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-debian-sid-cross-i686.Dockerfile b/ci/containers/ci-debian-sid-cross-i686.Dockerfile index f3c3a75119..fa751c5c25 100644 --- a/ci/containers/ci-debian-sid-cross-i686.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-i686.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross i686 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile b/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile index 95682c748c..332ac393a6 100644 --- a/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips64el debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile b/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile index 0ea3f0ac89..762c4eed8a 100644 --- a/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mipsel debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile b/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile index 8dc93482b3..0bdd9bb6c8 100644 --- a/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross ppc64le debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-debian-sid-cross-s390x.Dockerfile b/ci/containers/ci-debian-sid-cross-s390x.Dockerfile index d99f55e896..a3cfbd8d65 100644 --- a/ci/containers/ci-debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-s390x.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross s390x debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -110,7 +110,7 @@ pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 's390x'\n\ cpu = 's390x'\n\ -endian = 'little'" > /usr/local/share/meson/cross/s390x-linux-gnu +endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/ci-debian-sid.Dockerfile b/ci/containers/ci-debian-sid.Dockerfile index e2bef48135..a390eff1ff 100644 --- a/ci/containers/ci-debian-sid.Dockerfile +++ b/ci/containers/ci-debian-sid.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-fedora-32.Dockerfile b/ci/containers/ci-fedora-32.Dockerfile index 94bc3e1f92..6f4896ff2a 100644 --- a/ci/containers/ci-fedora-32.Dockerfile +++ b/ci/containers/ci-fedora-32.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-32 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM registry.fedoraproject.org/fedora:32 RUN dnf install -y nosync && \ diff --git a/ci/containers/ci-fedora-33.Dockerfile b/ci/containers/ci-fedora-33.Dockerfile index 370996cd2f..4f02ff315c 100644 --- a/ci/containers/ci-fedora-33.Dockerfile +++ b/ci/containers/ci-fedora-33.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-33 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM registry.fedoraproject.org/fedora:33 RUN dnf install -y nosync && \ diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile index 1e8a51faab..7339189fb8 100644 --- a/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM registry.fedoraproject.org/fedora:rawhide RUN dnf install -y nosync && \ diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile index ff7fb77a04..93eabb4bd4 100644 --- a/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM registry.fedoraproject.org/fedora:rawhide RUN dnf install -y nosync && \ diff --git a/ci/containers/ci-fedora-rawhide.Dockerfile b/ci/containers/ci-fedora-rawhide.Dockerfile index 539ee0a7c7..6bae8f4b7a 100644 --- a/ci/containers/ci-fedora-rawhide.Dockerfile +++ b/ci/containers/ci-fedora-rawhide.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM registry.fedoraproject.org/fedora:rawhide RUN dnf install -y nosync && \ diff --git a/ci/containers/ci-ubuntu-1804.Dockerfile b/ci/containers/ci-ubuntu-1804.Dockerfile index 842412b651..1a5dfe8c21 100644 --- a/ci/containers/ci-ubuntu-1804.Dockerfile +++ b/ci/containers/ci-ubuntu-1804.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-1804 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/ubuntu:18.04 RUN export DEBIAN_FRONTEND=noninteractive && \ diff --git a/ci/containers/ci-ubuntu-2004.Dockerfile b/ci/containers/ci-ubuntu-2004.Dockerfile index de7e63b4a7..ef6526e46e 100644 --- a/ci/containers/ci-ubuntu-2004.Dockerfile +++ b/ci/containers/ci-ubuntu-2004.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-2004 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da... FROM docker.io/library/ubuntu:20.04 RUN export DEBIAN_FRONTEND=noninteractive && \ -- 2.29.2

Leap 15.1 will reach EOL on January 31st 2021, so we should not test on it during the current development cycle ending in March 1st. Signed-off-by: Erik Skultety <eskultet@redhat.com> --- .gitlab-ci.yml | 17 +--- ci/containers/ci-opensuse-151.Dockerfile | 100 ----------------------- 2 files changed, 2 insertions(+), 115 deletions(-) delete mode 100644 ci/containers/ci-opensuse-151.Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 995ccc8ead..8949adf7a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,11 +172,6 @@ x64-fedora-rawhide-container: variables: NAME: fedora-rawhide -x64-opensuse-151-container: - extends: .container_job - variables: - NAME: opensuse-151 - x64-opensuse-152-container: extends: .container_job variables: @@ -382,14 +377,6 @@ x64-fedora-rawhide-clang: CC: clang RPM: skip -x64-opensuse-151: - extends: .native_build_job - needs: - - x64-opensuse-151-container - variables: - NAME: opensuse-151 - RPM: skip - x64-opensuse-152: extends: .native_build_job needs: @@ -558,9 +545,9 @@ website: codestyle: stage: builds - image: $CI_REGISTRY_IMAGE/ci-opensuse-151:latest + image: $CI_REGISTRY_IMAGE/ci-opensuse-152:latest needs: - - x64-opensuse-151-container + - x64-opensuse-152-container before_script: - *script_variables script: diff --git a/ci/containers/ci-opensuse-151.Dockerfile b/ci/containers/ci-opensuse-151.Dockerfile deleted file mode 100644 index 9458d2de0c..0000000000 --- a/ci/containers/ci-opensuse-151.Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile opensuse-151 libvirt -# -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c43... -FROM registry.opensuse.org/opensuse/leap:15.1 - -RUN zypper update -y && \ - zypper install -y \ - audit-devel \ - augeas \ - augeas-lenses \ - avahi-devel \ - bash-completion \ - ca-certificates \ - ccache \ - clang \ - cppi \ - cyrus-sasl-devel \ - dbus-1-devel \ - device-mapper-devel \ - diffutils \ - dnsmasq \ - dwarves \ - ebtables \ - fuse-devel \ - gcc \ - gettext \ - git \ - glib2-devel \ - glibc-devel \ - glibc-locale \ - glusterfs-devel \ - iproute2 \ - kmod \ - libacl-devel \ - libapparmor-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ - libgnutls-devel \ - libiscsi-devel \ - libnl3-devel \ - libnuma-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ - libtirpc-devel \ - libudev-devel \ - libwsman-devel \ - libxml2 \ - libxml2-devel \ - libxslt \ - libyajl-devel \ - lvm2 \ - make \ - nfs-utils \ - ninja \ - numad \ - open-iscsi \ - parted \ - parted-devel \ - perl \ - pkgconfig \ - polkit \ - python3 \ - python3-docutils \ - python3-flake8 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-tools \ - radvd \ - readline-devel \ - rpcgen \ - rpm-build \ - sanlock-devel \ - scrub \ - systemtap-sdt-devel \ - wireshark-devel \ - xen-devel \ - xfsprogs-devel && \ - zypper clean --all && \ - rpm -qa | sort > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) - -RUN pip3 install \ - meson==0.54.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -- 2.29.2