Merge 13d07435fe into fe7d114c6a

Bump E2E opensuse leap to 15.6, fix btrfs test (#10057 )
Signed-off-by: Derek Nola <derek.nola@suse.com>
2024-05-06 16:51:15 +02:00 · 2024-05-02 10:51:00 -07:00 · 2023-03-28 20:38:39 +08:00
5 changed files with 6 additions and 5 deletions
--- a/install.sh
+++ b/install.sh
@ -983,6 +983,7 @@ depend() {
 }

 start_pre() {
+    (ps -ef | grep -E "k3s .*(server|agent)" | grep -E -v "(init|grep|channelserver|supervise-daemon)" | awk '{print $2}' | xargs kill 2>/dev/null) || true
    rm -f /tmp/k3s.*
 }

--- a/tests/e2e/btrfs/Vagrantfile
+++ b/tests/e2e/btrfs/Vagrantfile
@ -4,7 +4,7 @@ ENV['VAGRANT_LOG']="error"
 NODE_ROLES = (ENV['E2E_NODE_ROLES'] ||
  ["server-0"])
 NODE_BOXES = (ENV['E2E_NODE_BOXES'] ||
-  ['opensuse/Leap-15.5.x86_64'])
+  ['opensuse/Leap-15.6.x86_64'])
 GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master")
 RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "")
 NODE_CPUS = (ENV['E2E_NODE_CPUS'] || 2).to_i
--- a/tests/e2e/btrfs/btrfs_test.go
+++ b/tests/e2e/btrfs/btrfs_test.go
@ -38,9 +38,9 @@ var _ = Describe("Verify that btrfs based servers work", Ordered, func() {
 			var err error
 			// OS and server are hardcoded because only openSUSE Leap 15.5 natively supports Btrfs
 			if *local {
-				serverNodeNames, _, err = e2e.CreateLocalCluster("opensuse/Leap-15.5.x86_64", 1, 0)
+				serverNodeNames, _, err = e2e.CreateLocalCluster("opensuse/Leap-15.6.x86_64", 1, 0)
 			} else {
-				serverNodeNames, _, err = e2e.CreateCluster("opensuse/Leap-15.5.x86_64", 1, 0)
+				serverNodeNames, _, err = e2e.CreateCluster("opensuse/Leap-15.6.x86_64", 1, 0)
 			}
 			Expect(err).NotTo(HaveOccurred(), e2e.GetVagrantLog(err))
 			fmt.Println("CLUSTER CONFIG")
--- a/tests/e2e/token/token_test.go
+++ b/tests/e2e/token/token_test.go
@ -14,7 +14,7 @@ import (
 )

 // Valid nodeOS:
-// generic/ubuntu2310, generic/centos7, generic/rocky8, opensuse/Leap-15.5.x86_64
+// generic/ubuntu2310, generic/centos7, generic/rocky8, opensuse/Leap-15.6.x86_64

 var nodeOS = flag.String("nodeOS", "generic/ubuntu2310", "VM operating system")
 var serverCount = flag.Int("serverCount", 3, "number of server nodes")
--- a/tests/install/opensuse-leap/Vagrantfile
+++ b/tests/install/opensuse-leap/Vagrantfile
@ -6,7 +6,7 @@ ENV['TEST_INSTALL_SH'] ||= '../../../install.sh'

 Vagrant.configure("2") do |config|
  config.vagrant.plugins = ["vagrant-k3s"]
-  config.vm.box = 'opensuse/Leap-15.5.x86_64'
+  config.vm.box = 'opensuse/Leap-15.6.x86_64'
  config.vm.boot_timeout = ENV['TEST_VM_BOOT_TIMEOUT'] || 600 # seconds
  config.vm.synced_folder '.', '/vagrant', disabled: true
Author	SHA1	Message	Date
Liyi Meng	2b0e709106	Merge `13d07435fe` into `fe7d114c6a`	2024-05-06 16:51:15 +02:00
Derek Nola	fe7d114c6a	Bump E2E opensuse leap to 15.6, fix btrfs test (#10057 ) Signed-off-by: Derek Nola <derek.nola@suse.com>	2024-05-02 10:51:00 -07:00
Liyi Meng	13d07435fe	Ensure old k3s processes are clean up Before starting up new k3s instance, make sure old ones are gone. To fix issue #7128 Signed-off-by: Liyi Meng <meng.mobile@gmail.com>	2023-03-28 20:38:39 +08:00