From f7c8b6ea2460bf905efa49765a956bb69bee562f Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Thu, 2 May 2024 10:51:00 -0700 Subject: [PATCH] Bump E2E opensuse leap to 15.6, fix btrfs test (#10057) Signed-off-by: Derek Nola --- tests/e2e/btrfs/Vagrantfile | 2 +- tests/e2e/btrfs/btrfs_test.go | 4 ++-- tests/e2e/token/token_test.go | 2 +- tests/install/opensuse-leap/Vagrantfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/e2e/btrfs/Vagrantfile b/tests/e2e/btrfs/Vagrantfile index 08b20c0f0b4c..b26c59d3ec5f 100644 --- 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 diff --git a/tests/e2e/btrfs/btrfs_test.go b/tests/e2e/btrfs/btrfs_test.go index 01bdb3384bed..a592a2e78823 100644 --- 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") diff --git a/tests/e2e/token/token_test.go b/tests/e2e/token/token_test.go index fb820370062a..af07814dcbad 100644 --- 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") diff --git a/tests/install/opensuse-leap/Vagrantfile b/tests/install/opensuse-leap/Vagrantfile index dd08103df959..c37a9887c2a7 100644 --- 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