[PATCH] ci: Switch to OpenSUSE leap 15.4

[Peter Krempa]

The '15.3' version is EOL now:

  https://get.opensuse.org/leap/15.3/

Also switch the  'codestyle' job to the appropriate container image.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .gitlab-ci.yml                                       |  8 ++++----
 .../{opensuse-leap-153.sh => opensuse-leap-154.sh}   |  5 +----
 ...p-153.Dockerfile => opensuse-leap-154.Dockerfile} |  8 ++------
 ci/gitlab/builds.yml                                 | 12 ++++++------
 ci/gitlab/containers.yml                             |  4 ++--
 ci/manifest.yml                                      |  2 +-
 6 files changed, 16 insertions(+), 23 deletions(-)
 rename ci/buildenv/{opensuse-leap-153.sh => opensuse-leap-154.sh} (95%)
 rename ci/containers/{opensuse-leap-153.Dockerfile => opensuse-leap-154.Dockerfile} (93%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b72ebc493..8bf6e5c6b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -118,18 +118,18 @@ codestyle_prebuilt_env:
     - .codestyle_job
     - .gitlab_native_build_job_prebuilt_env
   needs:
-    - job: x86_64-opensuse-leap-153-container
+    - job: x86_64-opensuse-leap-154-container
       optional: true
   variables:
-    NAME: opensuse-leap-153
+    NAME: opensuse-leap-154

 codestyle_local_env:
   extends:
     - .codestyle_job
     - .gitlab_native_build_job_local_env
   variables:
-    IMAGE: registry.opensuse.org/opensuse/leap:15.3
-    NAME: opensuse-leap-153
+    IMAGE: registry.opensuse.org/opensuse/leap:15.4
+    NAME: opensuse-leap-154


 # This artifact published by this job is downloaded to push to Weblate
diff --git a/ci/buildenv/opensuse-leap-153.sh b/ci/buildenv/opensuse-leap-154.sh
similarity index 95%
rename from ci/buildenv/opensuse-leap-153.sh
rename to ci/buildenv/opensuse-leap-154.sh
index b78382470c..93cb99c83b 100644
--- a/ci/buildenv/opensuse-leap-153.sh
+++ b/ci/buildenv/opensuse-leap-154.sh
@@ -59,6 +59,7 @@ function install_buildenv() {
            libyajl-devel \
            lvm2 \
            make \
+           meson \
            nfs-utils \
            ninja \
            numad \
@@ -70,9 +71,6 @@ function install_buildenv() {
            python3-base \
            python3-docutils \
            python3-flake8 \
-           python3-pip \
-           python3-setuptools \
-           python3-wheel \
            qemu-tools \
            readline-devel \
            rpcgen \
@@ -89,7 +87,6 @@ function install_buildenv() {
     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
-    /usr/bin/pip3 install meson==0.56.0
 }

 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
diff --git a/ci/containers/opensuse-leap-153.Dockerfile b/ci/containers/opensuse-leap-154.Dockerfile
similarity index 93%
rename from ci/containers/opensuse-leap-153.Dockerfile
rename to ci/containers/opensuse-leap-154.Dockerfile
index 49e0c98c8a..ca11edf808 100644
--- a/ci/containers/opensuse-leap-153.Dockerfile
+++ b/ci/containers/opensuse-leap-154.Dockerfile
@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci

-FROM registry.opensuse.org/opensuse/leap:15.3
+FROM registry.opensuse.org/opensuse/leap:15.4

 RUN zypper update -y && \
     zypper install -y \
@@ -60,6 +60,7 @@ RUN zypper update -y && \
            libyajl-devel \
            lvm2 \
            make \
+           meson \
            nfs-utils \
            ninja \
            numad \
@@ -71,9 +72,6 @@ RUN zypper update -y && \
            python3-base \
            python3-docutils \
            python3-flake8 \
-           python3-pip \
-           python3-setuptools \
-           python3-wheel \
            qemu-tools \
            readline-devel \
            rpcgen \
@@ -92,8 +90,6 @@ RUN zypper update -y && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc

-RUN /usr/bin/pip3 install meson==0.56.0
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 89c15fa28d..d982824b65 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -285,23 +285,23 @@ x86_64-fedora-rawhide-clang-local-env:
     RPM: skip


-x86_64-opensuse-leap-153-prebuilt-env:
+x86_64-opensuse-leap-154-prebuilt-env:
   extends: .native_build_job_prebuilt_env
   needs:
-    - job: x86_64-opensuse-leap-153-container
+    - job: x86_64-opensuse-leap-154-container
       optional: true
   allow_failure: false
   variables:
-    NAME: opensuse-leap-153
+    NAME: opensuse-leap-154
     RPM: skip

-x86_64-opensuse-leap-153-local-env:
+x86_64-opensuse-leap-154-local-env:
   extends: .native_build_job_local_env
   needs: []
   allow_failure: false
   variables:
-    IMAGE: registry.opensuse.org/opensuse/leap:15.3
-    NAME: opensuse-leap-153
+    IMAGE: registry.opensuse.org/opensuse/leap:15.4
+    NAME: opensuse-leap-154
     RPM: skip


diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index fa426bd3a6..150df26519 100644
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -77,11 +77,11 @@ x86_64-fedora-rawhide-container:
     NAME: fedora-rawhide


-x86_64-opensuse-leap-153-container:
+x86_64-opensuse-leap-154-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: opensuse-leap-153
+    NAME: opensuse-leap-154


 x86_64-opensuse-tumbleweed-container:
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 2aa9ce9952..b68c7361ab 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -160,7 +160,7 @@ targets:

   freebsd-13: x86_64

-  opensuse-leap-153:
+  opensuse-leap-154:
     jobs:
       - arch: x86_64
         variables:
-- 
2.39.2