[v2,2/2] tests: lcitool: Switch to OpenSUSE Leap 15.4

Commit Message

Peter Krempa April 17, 2023, 12:46 p.m. UTC

The 15.3 version is EOL now:

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

Switch the dockerfile to 15.4.

Signed-off-by: Peter Krempa <[e-mail]>
Reviewed-by: Daniel P. Berrangé <[e-mail]>
---
 tests/docker/dockerfiles/opensuse-leap.docker |  8 ++---
 tests/lcitool/mappings.yml                    | 36 +++++++++----------
 tests/lcitool/refresh                         |  2 +-
 ...use-leap-153.yml => opensuse-leap-154.yml} |  0
 4 files changed, 23 insertions(+), 23 deletions(-)
 rename tests/lcitool/targets/{opensuse-leap-153.yml => opensuse-leap-154.yml} (100%)

Comments

Olaf Hering April 17, 2023, 2:32 p.m. UTC | #1

Mon, 17 Apr 2023 14:46:54 +0200 Peter Krempa <[e-mail]>:

> Switch the dockerfile to 15.4.

Given that Leap 15.5 is essentially done, please skip this meanwhile stale version of Leap.

Thanks,
Olaf

Paolo Bonzini April 18, 2023, 9:05 a.m. UTC | #2

On 4/17/23 16:32, Olaf Hering wrote:
> Mon, 17 Apr 2023 14:46:54 +0200 Peter Krempa<[e-mail]>:
> 
>> Switch the dockerfile to 15.4.
>
> Given that Leap 15.5 is essentially done, please skip this meanwhile
> stale version of Leap.

The reason to do this update is to be able to update libvirt-ci, if 
needed for other reasons.  Even though 15.4 is already almost-obsolete, 
it doesn't hurt to switch CI to it.

Paolo

Daniel P. Berrangé April 18, 2023, 9:40 a.m. UTC | #3

On Mon, Apr 17, 2023 at 04:32:58PM +0200, Olaf Hering wrote:
> Mon, 17 Apr 2023 14:46:54 +0200 Peter Krempa <[e-mail]>:
> 
> > Switch the dockerfile to 15.4.
> 
> Given that Leap 15.5 is essentially done, please skip this meanwhile stale version of Leap.

15.4 is still the active release and doesn't have EOL until Dec this
year IIUC from:

  https://en.wikipedia.org/wiki/OpenSUSE

meanwhile 15.5 isn't out yet, and even when released, it is still valid
to be testing 15.4 as that's likely to remain more widely deployed for
a while after.

Ideally we would test both 15.4 and 15.5 but with limited CI resources
I think it is more valuable to test the older version, to ensure that
we don't accidentally introduce use of new features that break on the
older version.

With regards,
Daniel

Patch

diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index a0d802ab83..af32c2a42d 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -1,10 +1,10 @@ 
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all opensuse-leap-153 qemu
+#  $ lcitool dockerfile --layers all opensuse-leap-154 qemu
 #
 # 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 \
@@ -137,11 +137,11 @@  ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3.9"
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all opensuse-leap-153 qemu
+#  $ lcitool dockerfile --layers all opensuse-leap-154 qemu
 #
 # 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 \
diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml
index e4719e4551..2ef78bd788 100644
--- a/tests/lcitool/mappings.yml
+++ b/tests/lcitool/mappings.yml
@@ -1,71 +1,71 @@ 
 mappings:
   flake8:
     CentOSStream8:
-    OpenSUSELeap153:
+    OpenSUSELeap154:

   meson:
     CentOSStream8:
-    OpenSUSELeap153:
+    OpenSUSELeap154:

   python3:
     CentOSStream8: python38
-    OpenSUSELeap153: python39-base
+    OpenSUSELeap154: python39-base

   python3-PyYAML:
     CentOSStream8: python38-PyYAML
-    OpenSUSELeap153:
+    OpenSUSELeap154:

   python3-devel:
     CentOSStream8: python38-devel
-    OpenSUSELeap153: python39-devel
+    OpenSUSELeap154: python39-devel

   python3-docutils:
     CentOSStream8:
-    OpenSUSELeap153:
+    OpenSUSELeap154:

   python3-numpy:
     CentOSStream8: python38-numpy
-    OpenSUSELeap153:
+    OpenSUSELeap154:

   python3-opencv:
     CentOSStream8:
-    OpenSUSELeap153:
+    OpenSUSELeap154:

   python3-pillow:
     CentOSStream8:
-    OpenSUSELeap153:
+    OpenSUSELeap154:

   python3-pip:
     CentOSStream8: python38-pip
-    OpenSUSELeap153: python39-pip
+    OpenSUSELeap154: python39-pip

   python3-pillow:
     CentOSStream8:
-    OpenSUSELeap153:
+    OpenSUSELeap154:

   python3-selinux:
     CentOSStream8:
-    OpenSUSELeap153:
+    OpenSUSELeap154:

   python3-setuptools:
     CentOSStream8: python38-setuptools
-    OpenSUSELeap153: python39-setuptools
+    OpenSUSELeap154: python39-setuptools

   python3-sphinx:
     CentOSStream8:
-    OpenSUSELeap153:
+    OpenSUSELeap154:

   python3-sphinx-rtd-theme:
     CentOSStream8:
-    OpenSUSELeap153:
+    OpenSUSELeap154:

   python3-venv:
     CentOSStream8: python38
-    OpenSUSELeap153: python39-base
+    OpenSUSELeap154: python39-base

   python3-wheel:
     CentOSStream8: python38-wheel
-    OpenSUSELeap153: python39-pip
+    OpenSUSELeap154: python39-pip

 pypi_mappings:
   # Request more recent version
@@ -74,4 +74,4 @@  pypi_mappings:

   # Drop packages that need devel headers
   python3-numpy:
-    OpenSUSELeap153:
+    OpenSUSELeap154:
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index c0d7ad5516..b3acd9d6b0 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -120,7 +120,7 @@  try:
     generate_dockerfile("debian-amd64", "debian-11",
                         trailer="".join(debian11_extras))
     generate_dockerfile("fedora", "fedora-37")
-    generate_dockerfile("opensuse-leap", "opensuse-leap-153")
+    generate_dockerfile("opensuse-leap", "opensuse-leap-154")
     generate_dockerfile("ubuntu2004", "ubuntu-2004")
     generate_dockerfile("ubuntu2204", "ubuntu-2204")

diff --git a/tests/lcitool/targets/opensuse-leap-153.yml b/tests/lcitool/targets/opensuse-leap-154.yml
similarity index 100%
rename from tests/lcitool/targets/opensuse-leap-153.yml
rename to tests/lcitool/targets/opensuse-leap-154.yml