Merge pull request #1123 from marquiz/devel/opensuse

Support openSUSE Leap 15.6
intel · Jan 17, 2025 · 73ea6f7 · 73ea6f7
2 parents 5da0e9e + f1a571b
commit 73ea6f7
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 12 deletions.
diff --git a/demo/lib/distro.bash b/demo/lib/distro.bash
@@ -626,15 +626,11 @@ sles-install-utils() {
 }
 
 opensuse-image-url() {
-    opensuse-15_5-image-url
+    opensuse-15_6-image-url
 }
 
-opensuse-15_5-image-url() {
-    echo "https://download.opensuse.org/pub/opensuse/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2"
-}
-
-opensuse-15_5-image-url() {
-    echo "https://download.opensuse.org/pub/opensuse/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2"
+opensuse-15_6-image-url() {
+    echo "https://download.opensuse.org/pub/opensuse/distribution/leap/15.6/appliances/openSUSE-Leap-15.6-Minimal-VM.x86_64-Cloud.qcow2"
 }
 
 opensuse-tumbleweed-image-url() {
@@ -731,7 +727,7 @@ opensuse-install-k8s() {
     vm-command "echo 1 > /proc/sys/net/ipv4/ip_forward"
     vm-command "zypper ls"
     if ! grep -q snappy <<< "$COMMAND_OUTPUT"; then
-        distro-install-repo "http://download.opensuse.org/repositories/system:/snappy/openSUSE_Leap_15.5 snappy"
+        distro-install-repo "http://download.opensuse.org/repositories/system:/snappy/openSUSE_Leap_15.6 snappy"
         distro-refresh-pkg-db
     fi
     distro-install-pkg "snapd apparmor-profiles socat ebtables conntrackd iptables ethtool cni-plugins"

diff --git a/...cross-build/Dockerfile.opensuse-leap-15.5 → ...cross-build/Dockerfile.opensuse-leap-15.6 b/...cross-build/Dockerfile.opensuse-leap-15.5 → ...cross-build/Dockerfile.opensuse-leap-15.6
@@ -1,5 +1,5 @@
 # pull in base + a minimal set of useful packages
-FROM opensuse/leap:15.5 as suse-15.5-build
+FROM opensuse/leap:15.6 as suse-15.6-build
 
 ARG GO_VERSION=x.yz
 ARG GOLICENSES_VERSION

diff --git a/test/e2e/packages.test-suite/opensuse-15.5/binsrc.var b/test/e2e/packages.test-suite/opensuse-15.5/binsrc.var
diff --git a/test/e2e/packages.test-suite/opensuse-15.5/distro.var b/test/e2e/packages.test-suite/opensuse-15.5/distro.var
diff --git a/test/e2e/packages.test-suite/opensuse-15.6/binsrc.var b/test/e2e/packages.test-suite/opensuse-15.6/binsrc.var
@@ -0,0 +1 @@
+packages/opensuse-leap-15.6
diff --git a/...s.test-suite/opensuse-15.5/cri-resmgr.cfg → ...s.test-suite/opensuse-15.6/cri-resmgr.cfg b/...s.test-suite/opensuse-15.5/cri-resmgr.cfg → ...s.test-suite/opensuse-15.6/cri-resmgr.cfg
diff --git a/test/e2e/packages.test-suite/opensuse-15.6/distro.var b/test/e2e/packages.test-suite/opensuse-15.6/distro.var
@@ -0,0 +1 @@
+opensuse-15.6
diff --git a/...e-15.5/pkgtest/test01-systemd/code.var.sh → ...e-15.6/pkgtest/test01-systemd/code.var.sh b/...e-15.5/pkgtest/test01-systemd/code.var.sh → ...e-15.6/pkgtest/test01-systemd/code.var.sh
diff --git a/...e/opensuse-15.5/pkgtest/topology.var.json → ...e/opensuse-15.6/pkgtest/topology.var.json b/...e/opensuse-15.5/pkgtest/topology.var.json → ...e/opensuse-15.6/pkgtest/topology.var.json
diff --git a/...te/opensuse-15.5/reinstall_cri_resmgr.var → ...te/opensuse-15.6/reinstall_cri_resmgr.var b/...te/opensuse-15.5/reinstall_cri_resmgr.var → ...te/opensuse-15.6/reinstall_cri_resmgr.var
diff --git a/test/e2e/run.sh b/test/e2e/run.sh
@@ -101,7 +101,7 @@ usage() {
     echo "    distro:  Linux distribution to be / already installed on vm."
     echo "             Supported values: debian-11, debian-12, debian-sid"
     echo "                 fedora, opensuse-tumbleweed,"
-    echo "                 opensuse-15.5 (same as opensuse), sles,"
+    echo "                 opensuse-15.6 (same as opensuse), sles,"
     echo "                 ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04"
     echo "             If sles: set VM_SLES_REGCODE=<CODE> to use official packages."
     echo "    cgroups: cgroups version in the VM, v1 or v2. The default is v1."