From d1ed3d4e754a26d8318ae2f7968ce4ff53abe0ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 13 Jan 2021 12:16:03 +0000 Subject: [PATCH] gitlab: refresh container images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This replaces opensuse 15.1 with 15.2 This bring in the missing vte package dep Signed-off-by: Daniel P. Berrangé --- .gitlab-ci.yml | 8 ++++---- ci/containers/ci-centos-7.Dockerfile | 5 +++-- ci/containers/ci-centos-8.Dockerfile | 5 +++-- ci/containers/ci-centos-stream.Dockerfile | 5 +++-- ci/containers/ci-debian-10.Dockerfile | 3 ++- ci/containers/ci-debian-sid.Dockerfile | 3 ++- ci/containers/ci-fedora-32.Dockerfile | 5 +++-- ci/containers/ci-fedora-33.Dockerfile | 5 +++-- .../ci-fedora-rawhide-cross-mingw32.Dockerfile | 2 +- .../ci-fedora-rawhide-cross-mingw64.Dockerfile | 2 +- ci/containers/ci-fedora-rawhide.Dockerfile | 5 +++-- ...suse-151.Dockerfile => ci-opensuse-152.Dockerfile} | 11 ++++++----- ci/containers/ci-ubuntu-1804.Dockerfile | 3 ++- ci/containers/ci-ubuntu-2004.Dockerfile | 3 ++- 14 files changed, 38 insertions(+), 27 deletions(-) rename ci/containers/{ci-opensuse-151.Dockerfile => ci-opensuse-152.Dockerfile} (78%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d8ab94..8eedcd4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -151,10 +151,10 @@ x86-fedora-rawhide-container: variables: NAME: fedora-rawhide -x86-opensuse-151-container: +x86-opensuse-152-container: <<: *container_job_definition variables: - NAME: opensuse-151 + NAME: opensuse-152 x86-ubuntu-1804-container: <<: *container_job_definition @@ -219,10 +219,10 @@ x86-fedora-rawhide-dist-build: variables: NAME: fedora-rawhide -x86-opensuse-151-dist-build: +x86-opensuse-152-dist-build: <<: *dist_native_build_job_definition variables: - NAME: opensuse-151 + NAME: opensuse-152 RPM: skip x86-ubuntu-1804-dist-build: diff --git a/ci/containers/ci-centos-7.Dockerfile b/ci/containers/ci-centos-7.Dockerfile index a94745d..e4d79f0 100644 --- a/ci/containers/ci-centos-7.Dockerfile +++ b/ci/containers/ci-centos-7.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-7 libvirt+dist,libvirt-glib+dist,gtk-vnc+dist,virt-viewer # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/860993e19c005848fde8087941acdbd7ffdcf295 FROM registry.centos.org/centos:7 RUN yum update -y && \ @@ -32,7 +32,8 @@ RUN yum update -y && \ pkgconfig \ rest-devel \ rpm-build \ - spice-gtk3-devel && \ + spice-gtk3-devel \ + vte291-devel && \ yum autoremove -y && \ yum clean all -y && \ rpm -qa | sort > /packages.txt && \ diff --git a/ci/containers/ci-centos-8.Dockerfile b/ci/containers/ci-centos-8.Dockerfile index eafb079..5748eed 100644 --- a/ci/containers/ci-centos-8.Dockerfile +++ b/ci/containers/ci-centos-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-8 libvirt+minimal,libvirt-glib,gtk-vnc,virt-viewer # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/860993e19c005848fde8087941acdbd7ffdcf295 FROM docker.io/library/centos:8 RUN dnf update -y && \ @@ -51,7 +51,8 @@ RUN dnf update -y && \ rpcgen \ rpm-build \ spice-gtk3-devel \ - vala && \ + vala \ + vte291-devel && \ dnf autoremove -y && \ dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ diff --git a/ci/containers/ci-centos-stream.Dockerfile b/ci/containers/ci-centos-stream.Dockerfile index 853bb29..3a7ecf4 100644 --- a/ci/containers/ci-centos-stream.Dockerfile +++ b/ci/containers/ci-centos-stream.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-stream libvirt+minimal,libvirt-glib,gtk-vnc,virt-viewer # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/860993e19c005848fde8087941acdbd7ffdcf295 FROM docker.io/library/centos:8 RUN dnf update -y && \ @@ -52,7 +52,8 @@ RUN dnf update -y && \ rpcgen \ rpm-build \ spice-gtk3-devel \ - vala && \ + vala \ + vte291-devel && \ dnf autoremove -y && \ dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ diff --git a/ci/containers/ci-debian-10.Dockerfile b/ci/containers/ci-debian-10.Dockerfile index e19ab96..7a2b90a 100644 --- a/ci/containers/ci-debian-10.Dockerfile +++ b/ci/containers/ci-debian-10.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-10 libvirt+dist,libvirt-glib+dist,gtk-vnc+dist,virt-viewer # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/860993e19c005848fde8087941acdbd7ffdcf295 FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -29,6 +29,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libtool-bin \ libvirt-dev \ libvirt-glib-1.0-dev \ + libvte-2.91-dev \ libxml2-dev \ libxml2-utils \ locales \ diff --git a/ci/containers/ci-debian-sid.Dockerfile b/ci/containers/ci-debian-sid.Dockerfile index 93e19dc..aab4a0e 100644 --- a/ci/containers/ci-debian-sid.Dockerfile +++ b/ci/containers/ci-debian-sid.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-sid libvirt+dist,libvirt-glib+dist,gtk-vnc+dist,virt-viewer # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/860993e19c005848fde8087941acdbd7ffdcf295 FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -29,6 +29,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libtool-bin \ libvirt-dev \ libvirt-glib-1.0-dev \ + libvte-2.91-dev \ libxml2-dev \ libxml2-utils \ locales \ diff --git a/ci/containers/ci-fedora-32.Dockerfile b/ci/containers/ci-fedora-32.Dockerfile index b5ee4bd..13f8f22 100644 --- a/ci/containers/ci-fedora-32.Dockerfile +++ b/ci/containers/ci-fedora-32.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-32 libvirt+dist,libvirt-glib+dist,gtk-vnc+dist,virt-viewer # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/860993e19c005848fde8087941acdbd7ffdcf295 FROM registry.fedoraproject.org/fedora:32 RUN dnf install -y nosync && \ @@ -40,7 +40,8 @@ exec "$@"' > /usr/bin/nosync && \ pkgconfig \ rest-devel \ rpm-build \ - spice-gtk3-devel && \ + spice-gtk3-devel \ + vte291-devel && \ nosync dnf autoremove -y && \ nosync dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ diff --git a/ci/containers/ci-fedora-33.Dockerfile b/ci/containers/ci-fedora-33.Dockerfile index 0dd1555..99a50bd 100644 --- a/ci/containers/ci-fedora-33.Dockerfile +++ b/ci/containers/ci-fedora-33.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-33 libvirt+dist,libvirt-glib+dist,gtk-vnc+dist,virt-viewer # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/860993e19c005848fde8087941acdbd7ffdcf295 FROM registry.fedoraproject.org/fedora:33 RUN dnf install -y nosync && \ @@ -40,7 +40,8 @@ exec "$@"' > /usr/bin/nosync && \ pkgconfig \ rest-devel \ rpm-build \ - spice-gtk3-devel && \ + spice-gtk3-devel \ + vte291-devel && \ nosync dnf autoremove -y && \ nosync dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile index 4d94802..e646e58 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,libvirt-glib,gtk-vnc,virt-viewer # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/860993e19c005848fde8087941acdbd7ffdcf295 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 b63fa89..76a8019 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,libvirt-glib,gtk-vnc,virt-viewer # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/860993e19c005848fde8087941acdbd7ffdcf295 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 1ed667c..e297e44 100644 --- a/ci/containers/ci-fedora-rawhide.Dockerfile +++ b/ci/containers/ci-fedora-rawhide.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-rawhide libvirt+dist,libvirt-glib+dist,gtk-vnc+dist,virt-viewer # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/860993e19c005848fde8087941acdbd7ffdcf295 FROM registry.fedoraproject.org/fedora:rawhide RUN dnf install -y nosync && \ @@ -41,7 +41,8 @@ exec "$@"' > /usr/bin/nosync && \ pkgconfig \ rest-devel \ rpm-build \ - spice-gtk3-devel && \ + spice-gtk3-devel \ + vte291-devel && \ nosync dnf autoremove -y && \ nosync dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ diff --git a/ci/containers/ci-opensuse-151.Dockerfile b/ci/containers/ci-opensuse-152.Dockerfile similarity index 78% rename from ci/containers/ci-opensuse-151.Dockerfile rename to ci/containers/ci-opensuse-152.Dockerfile index 6181a73..393fe5d 100644 --- a/ci/containers/ci-opensuse-151.Dockerfile +++ b/ci/containers/ci-opensuse-152.Dockerfile @@ -1,9 +1,9 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile opensuse-151 libvirt+dist,libvirt-glib+dist,gtk-vnc+dist,virt-viewer +# $ lcitool dockerfile opensuse-152 libvirt+dist,libvirt-glib+dist,gtk-vnc+dist,virt-viewer # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680 -FROM registry.opensuse.org/opensuse/leap:15.1 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/860993e19c005848fde8087941acdbd7ffdcf295 +FROM registry.opensuse.org/opensuse/leap:15.2 RUN zypper update -y && \ zypper install -y \ @@ -17,7 +17,7 @@ RUN zypper update -y && \ git \ glib2-devel \ glibc-locale \ - gtk-vnc2-devel \ + gtk-vnc-devel \ gtk3-devel \ icoutils \ libgovirt-devel \ @@ -30,7 +30,8 @@ RUN zypper update -y && \ make \ pkgconfig \ rpm-build \ - spice-gtk-devel && \ + spice-gtk-devel \ + vte-devel && \ zypper clean --all && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ diff --git a/ci/containers/ci-ubuntu-1804.Dockerfile b/ci/containers/ci-ubuntu-1804.Dockerfile index eccf8ba..a1c90d3 100644 --- a/ci/containers/ci-ubuntu-1804.Dockerfile +++ b/ci/containers/ci-ubuntu-1804.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-1804 libvirt+dist,libvirt-glib+dist,gtk-vnc+dist,virt-viewer # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/860993e19c005848fde8087941acdbd7ffdcf295 FROM docker.io/library/ubuntu:18.04 RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -28,6 +28,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libtool-bin \ libvirt-dev \ libvirt-glib-1.0-dev \ + libvte-2.91-dev \ libxml2-dev \ libxml2-utils \ locales \ diff --git a/ci/containers/ci-ubuntu-2004.Dockerfile b/ci/containers/ci-ubuntu-2004.Dockerfile index 187ff16..fa42c5d 100644 --- a/ci/containers/ci-ubuntu-2004.Dockerfile +++ b/ci/containers/ci-ubuntu-2004.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-2004 libvirt+dist,libvirt-glib+dist,gtk-vnc+dist,virt-viewer # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/860993e19c005848fde8087941acdbd7ffdcf295 FROM docker.io/library/ubuntu:20.04 RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -28,6 +28,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libtool-bin \ libvirt-dev \ libvirt-glib-1.0-dev \ + libvte-2.91-dev \ libxml2-dev \ libxml2-utils \ locales \