ci: Rename CentOS Stream 8 and openSUSE Leap 15.2 containers

The names have been recently changed in libvirt-ci to be more
accurate, so we should follow along.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2f541efbc1a3ec2a7e15c40c61b398eb317c553..68e71c842b30286d17adf3b32e3c86e49dd72e98 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,10 +143,10 @@ x64-centos-8-container:
   variables:
     NAME: centos-8
 
-x64-centos-stream-container:
+x64-centos-stream-8-container:
   extends: .container_job
   variables:
-    NAME: centos-stream
+    NAME: centos-stream-8
 
 x64-debian-10-container:
   extends: .container_job
@@ -173,10 +173,10 @@ x64-fedora-rawhide-container:
   variables:
     NAME: fedora-rawhide
 
-x64-opensuse-152-container:
+x64-opensuse-leap-152-container:
   extends: .container_job
   variables:
-    NAME: opensuse-152
+    NAME: opensuse-leap-152
 
 x64-ubuntu-1804-container:
   extends: .container_job
@@ -339,12 +339,12 @@ x64-centos-8-clang:
     CC: clang
     RPM: skip
 
-x64-centos-stream:
+x64-centos-stream-8:
   extends: .native_build_job
   needs:
-    - x64-centos-stream-container
+    - x64-centos-stream-8-container
   variables:
-    NAME: centos-stream
+    NAME: centos-stream-8
     RPM: skip
 
 x64-fedora-32:
@@ -378,12 +378,12 @@ x64-fedora-rawhide-clang:
     CC: clang
     RPM: skip
 
-x64-opensuse-152:
+x64-opensuse-leap-152:
   extends: .native_build_job
   needs:
-    - x64-opensuse-152-container
+    - x64-opensuse-leap-152-container
   variables:
-    NAME: opensuse-152
+    NAME: opensuse-leap-152
     RPM: skip
 
 x64-ubuntu-1804:
@@ -539,9 +539,9 @@ website:
 
 codestyle:
   stage: builds
-  image: $CI_REGISTRY_IMAGE/ci-opensuse-152:latest
+  image: $CI_REGISTRY_IMAGE/ci-opensuse-leap-152:latest
   needs:
-    - x64-opensuse-152-container
+    - x64-opensuse-leap-152-container
   before_script:
     - *script_variables
   script:

diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile
new file mode 100644 (file)
index 0000000..3bc6677
--- /dev/null
+++ b/ci/containers/centos-stream-8.Dockerfile
@@ -0,0 +1,112 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool dockerfile centos-stream libvirt
+#
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca542937f7d4ea
+
+FROM docker.io/library/centos:8
+
+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 powertools && \
+    dnf install -y centos-release-advanced-virtualization && \
+    dnf install -y epel-release && \
+    dnf install -y \
+        audit-libs-devel \
+        augeas \
+        avahi-devel \
+        bash-completion \
+        ca-certificates \
+        ccache \
+        clang \
+        cpp \
+        cyrus-sasl-devel \
+        dbus-devel \
+        device-mapper-devel \
+        diffutils \
+        dnsmasq \
+        dwarves \
+        ebtables \
+        firewalld-filesystem \
+        fuse-devel \
+        gcc \
+        gettext \
+        git \
+        glib2-devel \
+        glibc-devel \
+        glibc-langpack-en \
+        glusterfs-api-devel \
+        gnutls-devel \
+        grep \
+        iproute \
+        iproute-tc \
+        iptables \
+        iscsi-initiator-utils \
+        kmod \
+        libacl-devel \
+        libattr-devel \
+        libblkid-devel \
+        libcap-ng-devel \
+        libcurl-devel \
+        libiscsi-devel \
+        libnl3-devel \
+        libpcap-devel \
+        libpciaccess-devel \
+        librbd-devel \
+        libselinux-devel \
+        libssh-devel \
+        libssh2-devel \
+        libtirpc-devel \
+        libudev-devel \
+        libwsman-devel \
+        libxml2 \
+        libxml2-devel \
+        libxslt \
+        lvm2 \
+        make \
+        netcf-devel \
+        nfs-utils \
+        ninja-build \
+        numactl-devel \
+        numad \
+        parted \
+        parted-devel \
+        perl \
+        pkgconfig \
+        polkit \
+        python3 \
+        python3-docutils \
+        python3-flake8 \
+        python3-pip \
+        python3-setuptools \
+        python3-wheel \
+        qemu-img \
+        radvd \
+        readline-devel \
+        rpcgen \
+        rpm-build \
+        sanlock-devel \
+        scrub \
+        sed \
+        systemtap-sdt-devel \
+        wireshark-devel \
+        xfsprogs-devel \
+        yajl-devel && \
+    dnf autoremove -y && \
+    dnf clean all -y && \
+    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/clang && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+
+RUN pip3 install \
+         meson==0.56.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"

diff --git a/ci/containers/centos-stream.Dockerfile b/ci/containers/centos-stream.Dockerfile
deleted file mode 100644 (file)
index 3bc6677..0000000
--- a/ci/containers/centos-stream.Dockerfile
+++ /dev/null
@@ -1,112 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile centos-stream libvirt
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca542937f7d4ea
-
-FROM docker.io/library/centos:8
-
-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 powertools && \
-    dnf install -y centos-release-advanced-virtualization && \
-    dnf install -y epel-release && \
-    dnf install -y \
-        audit-libs-devel \
-        augeas \
-        avahi-devel \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        clang \
-        cpp \
-        cyrus-sasl-devel \
-        dbus-devel \
-        device-mapper-devel \
-        diffutils \
-        dnsmasq \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        fuse-devel \
-        gcc \
-        gettext \
-        git \
-        glib2-devel \
-        glibc-devel \
-        glibc-langpack-en \
-        glusterfs-api-devel \
-        gnutls-devel \
-        grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libacl-devel \
-        libattr-devel \
-        libblkid-devel \
-        libcap-ng-devel \
-        libcurl-devel \
-        libiscsi-devel \
-        libnl3-devel \
-        libpcap-devel \
-        libpciaccess-devel \
-        librbd-devel \
-        libselinux-devel \
-        libssh-devel \
-        libssh2-devel \
-        libtirpc-devel \
-        libudev-devel \
-        libwsman-devel \
-        libxml2 \
-        libxml2-devel \
-        libxslt \
-        lvm2 \
-        make \
-        netcf-devel \
-        nfs-utils \
-        ninja-build \
-        numactl-devel \
-        numad \
-        parted \
-        parted-devel \
-        perl \
-        pkgconfig \
-        polkit \
-        python3 \
-        python3-docutils \
-        python3-flake8 \
-        python3-pip \
-        python3-setuptools \
-        python3-wheel \
-        qemu-img \
-        radvd \
-        readline-devel \
-        rpcgen \
-        rpm-build \
-        sanlock-devel \
-        scrub \
-        sed \
-        systemtap-sdt-devel \
-        wireshark-devel \
-        xfsprogs-devel \
-        yajl-devel && \
-    dnf autoremove -y && \
-    dnf clean all -y && \
-    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/clang && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-
-RUN pip3 install \
-         meson==0.56.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"

diff --git a/ci/containers/opensuse-152.Dockerfile b/ci/containers/opensuse-152.Dockerfile
deleted file mode 100644 (file)
index 6b56641..0000000
--- a/ci/containers/opensuse-152.Dockerfile
+++ /dev/null
@@ -1,106 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool dockerfile opensuse-152 libvirt
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca542937f7d4ea
-
-FROM registry.opensuse.org/opensuse/leap:15.2
-
-RUN zypper update -y && \
-    zypper install -y \
-           audit-devel \
-           augeas \
-           augeas-lenses \
-           avahi-devel \
-           bash-completion \
-           ca-certificates \
-           ccache \
-           clang \
-           cpp \
-           cppi \
-           cyrus-sasl-devel \
-           dbus-1-devel \
-           device-mapper-devel \
-           diffutils \
-           dnsmasq \
-           dwarves \
-           ebtables \
-           fuse-devel \
-           gcc \
-           gettext-runtime \
-           git \
-           glib2-devel \
-           glibc-devel \
-           glibc-locale \
-           glusterfs-devel \
-           grep \
-           iproute2 \
-           iptables \
-           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-base \
-           python3-docutils \
-           python3-flake8 \
-           python3-pip \
-           python3-setuptools \
-           python3-wheel \
-           qemu-tools \
-           radvd \
-           readline-devel \
-           rpcgen \
-           rpm-build \
-           sanlock-devel \
-           scrub \
-           sed \
-           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/clang && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-
-RUN pip3 install \
-         meson==0.56.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"

diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile
new file mode 100644 (file)
index 0000000..6b56641
--- /dev/null
+++ b/ci/containers/opensuse-leap-152.Dockerfile
@@ -0,0 +1,106 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool dockerfile opensuse-152 libvirt
+#
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca542937f7d4ea
+
+FROM registry.opensuse.org/opensuse/leap:15.2
+
+RUN zypper update -y && \
+    zypper install -y \
+           audit-devel \
+           augeas \
+           augeas-lenses \
+           avahi-devel \
+           bash-completion \
+           ca-certificates \
+           ccache \
+           clang \
+           cpp \
+           cppi \
+           cyrus-sasl-devel \
+           dbus-1-devel \
+           device-mapper-devel \
+           diffutils \
+           dnsmasq \
+           dwarves \
+           ebtables \
+           fuse-devel \
+           gcc \
+           gettext-runtime \
+           git \
+           glib2-devel \
+           glibc-devel \
+           glibc-locale \
+           glusterfs-devel \
+           grep \
+           iproute2 \
+           iptables \
+           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-base \
+           python3-docutils \
+           python3-flake8 \
+           python3-pip \
+           python3-setuptools \
+           python3-wheel \
+           qemu-tools \
+           radvd \
+           readline-devel \
+           rpcgen \
+           rpm-build \
+           sanlock-devel \
+           scrub \
+           sed \
+           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/clang && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
+
+RUN pip3 install \
+         meson==0.56.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"