remove minor version number from OpenSUSE LEAP target names

Just like Alma Linux only has the "9" version number, only use "15" in the target
name for OpenSUSE Leap.  The minor version is only needed in the FROM line of
the dockerfiles and for the installation URLs.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

12 files changed, 10 insertions, 10 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14512e9..0d67193 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -236,10 +236,10 @@ x86_64-check-fedora-rawhide:
   variables:
     NAME: fedora-rawhide
 
-x86_64-check-opensuse-leap-154:
+x86_64-check-opensuse-leap-15:
   extends: .check_container_template
   variables:
-    NAME: opensuse-leap-154
+    NAME: opensuse-leap-15
 
 x86_64-check-opensuse-tumbleweed:
   extends: .check_container_template
diff --git a/docs/containers.rst b/docs/containers.rst
index 0fe7d5a..abaa406 100644
--- a/docs/containers.rst
+++ b/docs/containers.rst
@@ -214,7 +214,7 @@ Usage examples
 
 
 - To access interactive shell with ``$DATADIR`` and ``$SCRIPT`` in the ``PWD``
-  in a *opensuse-leap-154* image with *libvirt-go* dependencies installed on it with
+  in a *opensuse-leap-15* image with *libvirt-go* dependencies installed on it with
   environment variable ``FOO=bar`` with user *1000* using *podman* engine.
 
   First, we need to build the actual container image to be able to run any
@@ -222,7 +222,7 @@ Usage examples
   ::
 
       lcitool container build \
-          --projects libvirt-go --target opensuse-leap-154
+          --projects libvirt-go --target opensuse-leap-15
 
 
   When the image is ready, we can proceed with running the workload
@@ -231,7 +231,7 @@ Usage examples
       lcitool container shell \
           --workload-dir $DATADIR --script $SCRIPT \
           --env FOO=baz --user 1000 \
-          lcitool.opensuse-leap-154
+          lcitool.opensuse-leap-15
 
 
 - To access interactive shell with ``$SCRIPT`` in the ``PWD`` in a
diff --git a/examples/manifest.yml b/examples/manifest.yml
index 5d44b1f..fa0a034 100644
--- a/examples/manifest.yml
+++ b/examples/manifest.yml
@@ -157,7 +157,7 @@ targets:
 
   macos-13: aarch64
 
-  opensuse-leap-154:
+  opensuse-leap-15:
     jobs:
       - arch: x86_64
 
diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml
index b29490c..ddf7e54 100644
--- a/lcitool/facts/mappings.yml
+++ b/lcitool/facts/mappings.yml
@@ -39,7 +39,7 @@
 #   - CentOS7
 #   - Debian9
 #   - FedoraRawhide
-#   - OpenSUSELeap154
+#   - OpenSUSELeap15
 #   - Ubuntu1804
 #
 # and so on.
@@ -883,7 +883,7 @@ mappings:
     deb: liblzma-dev
     Fedora: xz-static
     OpenSUSE:
-    OpenSUSELeap154: xz-static-devel
+    OpenSUSELeap15: xz-static-devel
     cross-policy-default: foreign
 
   libnfs:
diff --git a/lcitool/facts/targets/opensuse-leap-154.yml b/lcitool/facts/targets/opensuse-leap-15.yml
index d324156..b5ce1a9 100644
--- a/lcitool/facts/targets/opensuse-leap-154.yml
+++ b/lcitool/facts/targets/opensuse-leap-15.yml
@@ -1,7 +1,7 @@
 ---
 os:
   name: 'OpenSUSE'
-  version: 'Leap154'
+  version: 'Leap15'
 
 packaging:
   format: 'rpm'
diff --git a/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-154.Dockerfile b/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-15.Dockerfile
index 8f4137e..8f4137e 100644
--- a/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-154.Dockerfile
+++ b/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-15.Dockerfile
diff --git a/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-154.json b/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-15.json
index 6e581b2..6e581b2 100644
--- a/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-154.json
+++ b/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-15.json
diff --git a/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-154.sh b/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-15.sh
index 907973a..907973a 100644
--- a/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-154.sh
+++ b/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-15.sh
diff --git a/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-154.vars b/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-15.vars
index b0ad603..b0ad603 100644
--- a/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-154.vars
+++ b/tests/data/formatters/out/libvirt-go-xml-module-opensuse-leap-15.vars
diff --git a/tests/data/formatters/out/opensuse-leap-154-all-projects.Dockerfile b/tests/data/formatters/out/opensuse-leap-15-all-projects.Dockerfile
index eaccd85..eaccd85 100644
--- a/tests/data/formatters/out/opensuse-leap-154-all-projects.Dockerfile
+++ b/tests/data/formatters/out/opensuse-leap-15-all-projects.Dockerfile
diff --git a/tests/data/packages/out/opensuse-leap-154.yml b/tests/data/packages/out/opensuse-leap-15.yml
index 876464e..876464e 100644
--- a/tests/data/packages/out/opensuse-leap-154.yml
+++ b/tests/data/packages/out/opensuse-leap-15.yml
diff --git a/tests/test_formatters.py b/tests/test_formatters.py
index b28a096..d6f17b9 100644
--- a/tests/test_formatters.py
+++ b/tests/test_formatters.py
@@ -17,7 +17,7 @@ scenarios = [
     # A minimalist application, testing package managers
     pytest.param("libvirt-go-xml-module", "debian-10", None, id="libvirt-go-xml-module-debian-10"),
     pytest.param("libvirt-go-xml-module", "almalinux-8", None, id="libvirt-go-xml-module-almalinux-8"),
-    pytest.param("libvirt-go-xml-module", "opensuse-leap-154", None, id="libvirt-go-xml-module-opensuse-leap-154"),
+    pytest.param("libvirt-go-xml-module", "opensuse-leap-15", None, id="libvirt-go-xml-module-opensuse-leap-15"),
     pytest.param("libvirt-go-xml-module", "alpine-edge", None, id="libvirt-go-xml-module-alpine-edge"),
     pytest.param("libvirt-go-xml-module", "opensuse-tumbleweed", None, id="libvirt-go-xml-module-opensuse-tumbleweed"),