github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bump E2E opensuse leap to 15.6, fix btrfs test (#10057) 

Signed-off-by: Derek Nola <derek.nola@suse.com>
pull/10089/head
Derek Nola 2024-05-02 10:51:00 -07:00
parent b23f142da8
commit 222fc6c403
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/e2e/btrfs/Vagrantfile vendored
View File

@ -4,7 +4,7 @@ ENV['VAGRANT_LOG']="error"
NODE_ROLES = (ENV['E2E_NODE_ROLES'] || NODE_ROLES = (ENV['E2E_NODE_ROLES'] ||
["server-0"]) ["server-0"])
NODE_BOXES = (ENV['E2E_NODE_BOXES'] || 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") GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master")
RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "")
NODE_CPUS = (ENV['E2E_NODE_CPUS'] || 2).to_i NODE_CPUS = (ENV['E2E_NODE_CPUS'] || 2).to_i

4
tests/e2e/btrfs/btrfs_test.go
View File

@ -38,9 +38,9 @@ var _ = Describe("Verify that btrfs based servers work", Ordered, func() {
var err error var err error
// OS and server are hardcoded because only openSUSE Leap 15.5 natively supports Btrfs // OS and server are hardcoded because only openSUSE Leap 15.5 natively supports Btrfs
if *local { 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 { } 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)) Expect(err).NotTo(HaveOccurred(), e2e.GetVagrantLog(err))
fmt.Println("CLUSTER CONFIG") fmt.Println("CLUSTER CONFIG")

2
tests/e2e/token/token_test.go
View File

@ -14,7 +14,7 @@ import (
) )
// Valid nodeOS: // 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 nodeOS = flag.String("nodeOS", "generic/ubuntu2310", "VM operating system")
var serverCount = flag.Int("serverCount", 3, "number of server nodes") var serverCount = flag.Int("serverCount", 3, "number of server nodes")

2
tests/install/opensuse-leap/Vagrantfile vendored
View File

@ -6,7 +6,7 @@ ENV['TEST_INSTALL_SH'] ||= '../../../install.sh'
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vagrant.plugins = ["vagrant-k3s"] 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.boot_timeout = ENV['TEST_VM_BOOT_TIMEOUT'] || 600 # seconds
config.vm.synced_folder '.', '/vagrant', disabled: true config.vm.synced_folder '.', '/vagrant', disabled: true