diff --git a/demo/lib/distro.bash b/demo/lib/distro.bash index cff5e6805..41c71c5b4 100644 --- a/demo/lib/distro.bash +++ b/demo/lib/distro.bash @@ -601,11 +601,11 @@ sles-install-utils() { } opensuse-image-url() { - opensuse-15_4-image-url + opensuse-15_5-image-url } -opensuse-15_4-image-url() { - echo "https://download.opensuse.org/pub/opensuse/distribution/leap/15.4/appliances/openSUSE-Leap-15.4-Minimal-VM.x86_64-OpenStack-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_5-image-url() { @@ -763,7 +763,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.4 snappy" + distro-install-repo "http://download.opensuse.org/repositories/system:/snappy/openSUSE_Leap_15.5 snappy" distro-refresh-pkg-db fi distro-install-pkg "snapd apparmor-profiles socat ebtables cri-tools conntrackd iptables ethtool" diff --git a/dockerfiles/cross-build/Dockerfile.opensuse-leap-15.4 b/dockerfiles/cross-build/Dockerfile.opensuse-leap-15.5 similarity index 93% rename from dockerfiles/cross-build/Dockerfile.opensuse-leap-15.4 rename to dockerfiles/cross-build/Dockerfile.opensuse-leap-15.5 index f899da889..47d0b12cd 100644 --- a/dockerfiles/cross-build/Dockerfile.opensuse-leap-15.4 +++ b/dockerfiles/cross-build/Dockerfile.opensuse-leap-15.5 @@ -1,5 +1,5 @@ # pull in base + a minimal set of useful packages -FROM opensuse/leap:15.4 as suse-15.4-build +FROM opensuse/leap:15.5 as suse-15.5-build ARG GO_VERSION=x.yz ARG GOLICENSES_VERSION diff --git a/test/e2e/packages.test-suite/opensuse-15.4/binsrc.var b/test/e2e/packages.test-suite/opensuse-15.4/binsrc.var deleted file mode 100644 index 7e148e86e..000000000 --- a/test/e2e/packages.test-suite/opensuse-15.4/binsrc.var +++ /dev/null @@ -1 +0,0 @@ -packages/opensuse-leap-15.4 diff --git a/test/e2e/packages.test-suite/opensuse-15.4/distro.var b/test/e2e/packages.test-suite/opensuse-15.4/distro.var deleted file mode 100644 index 8b203119f..000000000 --- a/test/e2e/packages.test-suite/opensuse-15.4/distro.var +++ /dev/null @@ -1 +0,0 @@ -opensuse-15.4 diff --git a/test/e2e/packages.test-suite/opensuse-15.5/binsrc.var b/test/e2e/packages.test-suite/opensuse-15.5/binsrc.var new file mode 100644 index 000000000..d713eecbb --- /dev/null +++ b/test/e2e/packages.test-suite/opensuse-15.5/binsrc.var @@ -0,0 +1 @@ +packages/opensuse-leap-15.5 diff --git a/test/e2e/packages.test-suite/opensuse-15.4/cri-resmgr.cfg b/test/e2e/packages.test-suite/opensuse-15.5/cri-resmgr.cfg similarity index 100% rename from test/e2e/packages.test-suite/opensuse-15.4/cri-resmgr.cfg rename to test/e2e/packages.test-suite/opensuse-15.5/cri-resmgr.cfg diff --git a/test/e2e/packages.test-suite/opensuse-15.5/distro.var b/test/e2e/packages.test-suite/opensuse-15.5/distro.var new file mode 100644 index 000000000..73972bca8 --- /dev/null +++ b/test/e2e/packages.test-suite/opensuse-15.5/distro.var @@ -0,0 +1 @@ +opensuse-15.5 diff --git a/test/e2e/packages.test-suite/opensuse-15.4/pkgtest/test01-systemd/code.var.sh b/test/e2e/packages.test-suite/opensuse-15.5/pkgtest/test01-systemd/code.var.sh similarity index 100% rename from test/e2e/packages.test-suite/opensuse-15.4/pkgtest/test01-systemd/code.var.sh rename to test/e2e/packages.test-suite/opensuse-15.5/pkgtest/test01-systemd/code.var.sh diff --git a/test/e2e/packages.test-suite/opensuse-15.4/pkgtest/topology.var.json b/test/e2e/packages.test-suite/opensuse-15.5/pkgtest/topology.var.json similarity index 100% rename from test/e2e/packages.test-suite/opensuse-15.4/pkgtest/topology.var.json rename to test/e2e/packages.test-suite/opensuse-15.5/pkgtest/topology.var.json diff --git a/test/e2e/packages.test-suite/opensuse-15.4/reinstall_cri_resmgr.var b/test/e2e/packages.test-suite/opensuse-15.5/reinstall_cri_resmgr.var similarity index 100% rename from test/e2e/packages.test-suite/opensuse-15.4/reinstall_cri_resmgr.var rename to test/e2e/packages.test-suite/opensuse-15.5/reinstall_cri_resmgr.var diff --git a/test/e2e/run.sh b/test/e2e/run.sh index 0c7c42c89..c187a9bb2 100755 --- 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-10, debian-sid" echo " fedora, fedora-33, opensuse-tumbleweed," - echo " opensuse-15.4 (same as opensuse), opensuse-15.5, sles," + echo " opensuse-15.5 (same as opensuse), sles," echo " ubuntu-18.04, ubuntu-20.04, ubuntu-22.04" echo " If sles: set VM_SLES_REGCODE= to use official packages." echo " cgroups: cgroups version in the VM, v1 or v2. The default is v1."