From 47d96bdf2ab1efc176a759c4cb0ee88e292dea87 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Fri, 16 Feb 2024 12:30:12 -0800 Subject: [PATCH] Move to ubuntu 2204 for all E2E tests Simplify node roles Signed-off-by: Derek Nola --- Dockerfile.test | 2 +- tests/e2e/btrfs/Vagrantfile | 11 ++++------- tests/e2e/dualstack/Vagrantfile | 13 +++++-------- tests/e2e/dualstack/dualstack_test.go | 4 ++-- tests/e2e/embeddedmirror/Vagrantfile | 15 ++++++--------- tests/e2e/embeddedmirror/embeddedmirror_test.go | 4 ++-- tests/e2e/externalip/Vagrantfile | 13 +++++-------- tests/e2e/externalip/externalip_test.go | 4 ++-- tests/e2e/privateregistry/Vagrantfile | 15 ++++++--------- tests/e2e/privateregistry/privateregistry_test.go | 4 ++-- tests/e2e/rootless/Vagrantfile | 4 ++-- tests/e2e/rootless/rootless_test.go | 2 +- tests/e2e/rotateca/Vagrantfile | 11 ++++------- tests/e2e/rotateca/rotateca_test.go | 2 +- tests/e2e/s3/Vagrantfile | 13 +++++-------- tests/e2e/s3/s3_test.go | 4 ++-- tests/e2e/scripts/run_tests.sh | 2 +- tests/e2e/secretsencryption/Vagrantfile | 13 +++++-------- .../secretsencryption/secretsencryption_test.go | 4 ++-- tests/e2e/secretsencryption_old/Vagrantfile | 13 +++++-------- .../secretsencryption_test.go | 4 ++-- tests/e2e/snapshotrestore/Vagrantfile | 13 +++++-------- tests/e2e/snapshotrestore/snapshotrestore_test.go | 4 ++-- tests/e2e/splitserver/Vagrantfile | 13 +++++-------- tests/e2e/splitserver/splitserver_test.go | 4 ++-- tests/e2e/startup/Vagrantfile | 13 +++++-------- tests/e2e/startup/startup_test.go | 4 ++-- tests/e2e/tailscale/Vagrantfile | 4 ++-- tests/e2e/tailscale/tailscale_test.go | 4 ++-- tests/e2e/token/Vagrantfile | 4 ++-- tests/e2e/token/token_test.go | 4 ++-- tests/e2e/upgradecluster/Vagrantfile | 6 +++--- tests/e2e/upgradecluster/upgradecluster_test.go | 4 ++-- tests/e2e/validatecluster/Vagrantfile | 13 +++++-------- tests/e2e/validatecluster/validatecluster_test.go | 4 ++-- 35 files changed, 106 insertions(+), 145 deletions(-) diff --git a/Dockerfile.test b/Dockerfile.test index 01f2ce40ffb5..42f6fafd6648 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -40,7 +40,7 @@ FROM vagrantlibvirt/vagrant-libvirt:0.12.1 AS test-e2e RUN apt-get update && apt-get install -y docker.io ENV VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1 RUN vagrant plugin install vagrant-k3s vagrant-reload vagrant-scp -RUN vagrant box add generic/ubuntu2004 --provider libvirt --force +RUN vagrant box add generic/ubuntu2204 --provider libvirt --force RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"; \ chmod +x ./kubectl; \ mv ./kubectl /usr/local/bin/kubectl diff --git a/tests/e2e/btrfs/Vagrantfile b/tests/e2e/btrfs/Vagrantfile index 832339a2238a..08b20c0f0b4c 100644 --- a/tests/e2e/btrfs/Vagrantfile +++ b/tests/e2e/btrfs/Vagrantfile @@ -90,13 +90,10 @@ Vagrant.configure("2") do |config| NODE_BOXES = NODE_BOXES.split(" ", -1) end - # Must iterate on the index, vagrant does not understand iterating - # over the node roles themselves - NODE_ROLES.length.times do |i| - name = NODE_ROLES[i] - role_num = name.split("-", -1).pop.to_i - config.vm.define name do |node| - provision(node.vm, name, role_num, i) + NODE_ROLES.each_with_index do |role, i| + role_num = role.split("-", -1).pop.to_i + config.vm.define role do |node| + provision(node.vm, role, role_num, i) end end end diff --git a/tests/e2e/dualstack/Vagrantfile b/tests/e2e/dualstack/Vagrantfile index 2b31bfb0e949..18d22c4e887a 100644 --- a/tests/e2e/dualstack/Vagrantfile +++ b/tests/e2e/dualstack/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-0", "server-1", "server-2", "agent-0" ]) NODE_BOXES = (ENV['E2E_NODE_BOXES'] || - ['generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004']) + ['generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204']) GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") GOCOVER = (ENV['E2E_GOCOVER'] || "") @@ -99,13 +99,10 @@ Vagrant.configure("2") do |config| NODE_BOXES = NODE_BOXES.split(" ", -1) end - # Must iterate on the index, vagrant does not understand iterating - # over the node roles themselves - NODE_ROLES.length.times do |i| - name = NODE_ROLES[i] - role_num = name.split("-", -1).pop.to_i - config.vm.define name do |node| - provision(node.vm, name, role_num, i) + NODE_ROLES.each_with_index do |role, i| + role_num = role.split("-", -1).pop.to_i + config.vm.define role do |node| + provision(node.vm, role, role_num, i) end end end diff --git a/tests/e2e/dualstack/dualstack_test.go b/tests/e2e/dualstack/dualstack_test.go index 36f33904445b..be13a7c78887 100644 --- a/tests/e2e/dualstack/dualstack_test.go +++ b/tests/e2e/dualstack/dualstack_test.go @@ -12,8 +12,8 @@ import ( . "github.com/onsi/gomega" ) -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +// Valid nodeOS: generic/ubuntu2204, opensuse/Leap-15.3.x86_64 +var nodeOS = flag.String("nodeOS", "generic/ubuntu2204", "VM operating system") var serverCount = flag.Int("serverCount", 3, "number of server nodes") var agentCount = flag.Int("agentCount", 1, "number of agent nodes") var hardened = flag.Bool("hardened", false, "true or false") diff --git a/tests/e2e/embeddedmirror/Vagrantfile b/tests/e2e/embeddedmirror/Vagrantfile index a4a3072955e0..ab8750ebdd1e 100644 --- a/tests/e2e/embeddedmirror/Vagrantfile +++ b/tests/e2e/embeddedmirror/Vagrantfile @@ -1,8 +1,8 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || - ["server-0", "server-1", "server-2", "agent-0", "agent-1"]) + ["server-0", "agent-0"]) NODE_BOXES = (ENV['E2E_NODE_BOXES'] || - ['generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004']) + ['generic/ubuntu2204', 'generic/ubuntu2204']) GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") GOCOVER = (ENV['E2E_GOCOVER'] || "") @@ -111,13 +111,10 @@ Vagrant.configure("2") do |config| NODE_BOXES = NODE_BOXES.split(" ", -1) end - # Must iterate on the index, vagrant does not understand iterating - # over the node roles themselves - NODE_ROLES.length.times do |i| - name = NODE_ROLES[i] - role_num = name.split("-", -1).pop.to_i - config.vm.define name do |node| - provision(node.vm, name, role_num, i) + NODE_ROLES.each_with_index do |role, i| + role_num = role.split("-", -1).pop.to_i + config.vm.define role do |node| + provision(node.vm, role, role_num, i) end end end diff --git a/tests/e2e/embeddedmirror/embeddedmirror_test.go b/tests/e2e/embeddedmirror/embeddedmirror_test.go index efbcb4582c99..d7695cef516a 100644 --- a/tests/e2e/embeddedmirror/embeddedmirror_test.go +++ b/tests/e2e/embeddedmirror/embeddedmirror_test.go @@ -13,9 +13,9 @@ import ( ) // Valid nodeOS: -// generic/ubuntu2004, generic/centos7, generic/rocky8, +// generic/ubuntu2204, generic/centos7, generic/rocky8, // opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +var nodeOS = flag.String("nodeOS", "generic/ubuntu2204", "VM operating system") var serverCount = flag.Int("serverCount", 1, "number of server nodes") var agentCount = flag.Int("agentCount", 1, "number of agent nodes") var ci = flag.Bool("ci", false, "running on CI") diff --git a/tests/e2e/externalip/Vagrantfile b/tests/e2e/externalip/Vagrantfile index d10809157778..54ddf4483a3f 100644 --- a/tests/e2e/externalip/Vagrantfile +++ b/tests/e2e/externalip/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-0", "agent-0" ]) NODE_BOXES = (ENV['E2E_NODE_BOXES'] || - ['generic/ubuntu2004', 'generic/ubuntu2004']) + ['generic/ubuntu2204', 'generic/ubuntu2204']) GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") GOCOVER = (ENV['E2E_GOCOVER'] || "") @@ -74,13 +74,10 @@ Vagrant.configure("2") do |config| NODE_BOXES = NODE_BOXES.split(" ", -1) end - # Must iterate on the index, vagrant does not understand iterating - # over the node roles themselves - NODE_ROLES.length.times do |i| - name = NODE_ROLES[i] - role_num = name.split("-", -1).pop.to_i - config.vm.define name do |node| - provision(node.vm, name, role_num, i) + NODE_ROLES.each_with_index do |role, i| + role_num = role.split("-", -1).pop.to_i + config.vm.define role do |node| + provision(node.vm, role, role_num, i) end end end diff --git a/tests/e2e/externalip/externalip_test.go b/tests/e2e/externalip/externalip_test.go index a376f04e382f..4557296d1c2e 100644 --- a/tests/e2e/externalip/externalip_test.go +++ b/tests/e2e/externalip/externalip_test.go @@ -17,8 +17,8 @@ import ( . "github.com/onsi/gomega" ) -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +// Valid nodeOS: generic/ubuntu2204, opensuse/Leap-15.3.x86_64 +var nodeOS = flag.String("nodeOS", "generic/ubuntu2204", "VM operating system") var serverCount = flag.Int("serverCount", 1, "number of server nodes") var agentCount = flag.Int("agentCount", 1, "number of agent nodes") var hardened = flag.Bool("hardened", false, "true or false") diff --git a/tests/e2e/privateregistry/Vagrantfile b/tests/e2e/privateregistry/Vagrantfile index 4f5f26a4b43a..15d6c1c1a3ca 100644 --- a/tests/e2e/privateregistry/Vagrantfile +++ b/tests/e2e/privateregistry/Vagrantfile @@ -1,8 +1,8 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || - ["server-0", "server-1", "server-2", "agent-0", "agent-1"]) + ["server-0", "agent-0"]) NODE_BOXES = (ENV['E2E_NODE_BOXES'] || - ['generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004']) + ['generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204']) GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") GOCOVER = (ENV['E2E_GOCOVER'] || "") @@ -116,13 +116,10 @@ Vagrant.configure("2") do |config| NODE_BOXES = NODE_BOXES.split(" ", -1) end - # Must iterate on the index, vagrant does not understand iterating - # over the node roles themselves - NODE_ROLES.length.times do |i| - name = NODE_ROLES[i] - role_num = name.split("-", -1).pop.to_i - config.vm.define name do |node| - provision(node.vm, name, role_num, i) + NODE_ROLES.each_with_index do |role, i| + role_num = role.split("-", -1).pop.to_i + config.vm.define role do |node| + provision(node.vm, role, role_num, i) end end end diff --git a/tests/e2e/privateregistry/privateregistry_test.go b/tests/e2e/privateregistry/privateregistry_test.go index 87957064f9cc..c4a5c99883d9 100644 --- a/tests/e2e/privateregistry/privateregistry_test.go +++ b/tests/e2e/privateregistry/privateregistry_test.go @@ -13,9 +13,9 @@ import ( ) // Valid nodeOS: -// generic/ubuntu2004, generic/centos7, generic/rocky8, +// generic/ubuntu2204, generic/centos7, generic/rocky8, // opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +var nodeOS = flag.String("nodeOS", "generic/ubuntu2204", "VM operating system") var serverCount = flag.Int("serverCount", 1, "number of server nodes") var agentCount = flag.Int("agentCount", 1, "number of agent nodes") var ci = flag.Bool("ci", false, "running on CI") diff --git a/tests/e2e/rootless/Vagrantfile b/tests/e2e/rootless/Vagrantfile index dda93ad2eaa9..12f86c3e9ddd 100644 --- a/tests/e2e/rootless/Vagrantfile +++ b/tests/e2e/rootless/Vagrantfile @@ -59,8 +59,8 @@ Vagrant.configure("2") do |config| end NODE_ROLES.each_with_index do |name, i| - role_num = name.split("-", -1).pop.to_i - config.vm.define name do |node| + role_num = role.split("-", -1).pop.to_i + config.vm.define role do |node| provision(node.vm, name, role_num, i) end end diff --git a/tests/e2e/rootless/rootless_test.go b/tests/e2e/rootless/rootless_test.go index fa13796319da..79a800c8f8cc 100644 --- a/tests/e2e/rootless/rootless_test.go +++ b/tests/e2e/rootless/rootless_test.go @@ -14,7 +14,7 @@ import ( // Rootless is only valid on a single node, but requires node/kernel configuration, requiring a E2E test environment. -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 +// Valid nodeOS: generic/ubuntu2204, opensuse/Leap-15.3.x86_64 var nodeOS = flag.String("nodeOS", "generic/ubuntu2204", "VM operating system") var ci = flag.Bool("ci", false, "running on CI") var local = flag.Bool("local", false, "deploy a locally built K3s binary") diff --git a/tests/e2e/rotateca/Vagrantfile b/tests/e2e/rotateca/Vagrantfile index 54bb113f7fb8..0dd3764f3af8 100644 --- a/tests/e2e/rotateca/Vagrantfile +++ b/tests/e2e/rotateca/Vagrantfile @@ -78,13 +78,10 @@ Vagrant.configure("2") do |config| NODE_BOXES = NODE_BOXES.split(" ", -1) end - # Must iterate on the index, vagrant does not understand iterating - # over the node roles themselves - NODE_ROLES.length.times do |i| - name = NODE_ROLES[i] - role_num = name.split("-", -1).pop.to_i - config.vm.define name do |node| - provision(node.vm, name, role_num, i) + NODE_ROLES.each_with_index do |role, i| + role_num = role.split("-", -1).pop.to_i + config.vm.define role do |node| + provision(node.vm, role, role_num, i) end end end diff --git a/tests/e2e/rotateca/rotateca_test.go b/tests/e2e/rotateca/rotateca_test.go index 0ba640a566ff..9c201c8e713a 100644 --- a/tests/e2e/rotateca/rotateca_test.go +++ b/tests/e2e/rotateca/rotateca_test.go @@ -12,7 +12,7 @@ import ( . "github.com/onsi/gomega" ) -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 +// Valid nodeOS: generic/ubuntu2204, opensuse/Leap-15.3.x86_64 var nodeOS = flag.String("nodeOS", "generic/ubuntu2204", "VM operating system") var serverCount = flag.Int("serverCount", 3, "number of server nodes") var agentCount = flag.Int("agentCount", 1, "number of agent nodes") diff --git a/tests/e2e/s3/Vagrantfile b/tests/e2e/s3/Vagrantfile index 4aa10e10b5f7..d59f239dd1dd 100644 --- a/tests/e2e/s3/Vagrantfile +++ b/tests/e2e/s3/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-0"]) NODE_BOXES = (ENV['E2E_NODE_BOXES'] || - ['generic/ubuntu2004']) + ['generic/ubuntu2204']) GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") GOCOVER = (ENV['E2E_GOCOVER'] || "") @@ -81,13 +81,10 @@ Vagrant.configure("2") do |config| NODE_BOXES = NODE_BOXES.split(" ", -1) end - # Must iterate on the index, vagrant does not understand iterating - # over the node roles themselves - NODE_ROLES.length.times do |i| - name = NODE_ROLES[i] - role_num = name.split("-", -1).pop.to_i - config.vm.define name do |node| - provision(node.vm, name, role_num, i) + NODE_ROLES.each_with_index do |role, i| + role_num = role.split("-", -1).pop.to_i + config.vm.define role do |node| + provision(node.vm, role, role_num, i) end end end diff --git a/tests/e2e/s3/s3_test.go b/tests/e2e/s3/s3_test.go index d3d40d94d1f4..e109235e00b0 100644 --- a/tests/e2e/s3/s3_test.go +++ b/tests/e2e/s3/s3_test.go @@ -13,9 +13,9 @@ import ( ) // Valid nodeOS: -// generic/ubuntu2004, generic/centos7, generic/rocky8, +// generic/ubuntu2204, generic/centos7, generic/rocky8, // opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +var nodeOS = flag.String("nodeOS", "generic/ubuntu2204", "VM operating system") var ci = flag.Bool("ci", false, "running on CI") var local = flag.Bool("local", false, "deploy a locally built K3s binary") diff --git a/tests/e2e/scripts/run_tests.sh b/tests/e2e/scripts/run_tests.sh index aeb2c4127001..25bdcf283392 100755 --- a/tests/e2e/scripts/run_tests.sh +++ b/tests/e2e/scripts/run_tests.sh @@ -1,6 +1,6 @@ #!/bin/bash -nodeOS=${1:-"generic/ubuntu2004"} +nodeOS=${1:-"generic/ubuntu2204"} servercount=${2:-3} agentcount=${3:-1} db=${4:-"etcd"} diff --git a/tests/e2e/secretsencryption/Vagrantfile b/tests/e2e/secretsencryption/Vagrantfile index 94cd61fc683e..0afecfbf178a 100644 --- a/tests/e2e/secretsencryption/Vagrantfile +++ b/tests/e2e/secretsencryption/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-0", "server-1", "server-2"]) NODE_BOXES = (ENV['E2E_NODE_BOXES'] || - ['generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004']) + ['generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204']) GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") GOCOVER = (ENV['E2E_GOCOVER'] || "") @@ -66,13 +66,10 @@ Vagrant.configure("2") do |config| NODE_BOXES = NODE_BOXES.split(" ", -1) end - # Must iterate on the index, vagrant does not understand iterating - # over the node roles themselves - NODE_ROLES.length.times do |i| - name = NODE_ROLES[i] - role_num = name.split("-", -1).pop.to_i - config.vm.define name do |node| - provision(node.vm, name, role_num, i) + NODE_ROLES.each_with_index do |role, i| + role_num = role.split("-", -1).pop.to_i + config.vm.define role do |node| + provision(node.vm, role, role_num, i) end end end diff --git a/tests/e2e/secretsencryption/secretsencryption_test.go b/tests/e2e/secretsencryption/secretsencryption_test.go index 61b886467d5a..40518d74d9ce 100644 --- a/tests/e2e/secretsencryption/secretsencryption_test.go +++ b/tests/e2e/secretsencryption/secretsencryption_test.go @@ -15,8 +15,8 @@ import ( // This test is desigened for the new secrets-encrypt rotate-keys command, // Added in v1.28.0+k3s1 -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +// Valid nodeOS: generic/ubuntu2204, opensuse/Leap-15.3.x86_64 +var nodeOS = flag.String("nodeOS", "generic/ubuntu2204", "VM operating system") var serverCount = flag.Int("serverCount", 3, "number of server nodes") var hardened = flag.Bool("hardened", false, "true or false") var ci = flag.Bool("ci", false, "running on CI") diff --git a/tests/e2e/secretsencryption_old/Vagrantfile b/tests/e2e/secretsencryption_old/Vagrantfile index d93ddf3d13f3..b7eb9f7798e6 100644 --- a/tests/e2e/secretsencryption_old/Vagrantfile +++ b/tests/e2e/secretsencryption_old/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-0", "server-1", "server-2"]) NODE_BOXES = (ENV['E2E_NODE_BOXES'] || - ['generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004']) + ['generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204']) GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") GOCOVER = (ENV['E2E_GOCOVER'] || "") @@ -65,13 +65,10 @@ Vagrant.configure("2") do |config| NODE_BOXES = NODE_BOXES.split(" ", -1) end - # Must iterate on the index, vagrant does not understand iterating - # over the node roles themselves - NODE_ROLES.length.times do |i| - name = NODE_ROLES[i] - role_num = name.split("-", -1).pop.to_i - config.vm.define name do |node| - provision(node.vm, name, role_num, i) + NODE_ROLES.each_with_index do |role, i| + role_num = role.split("-", -1).pop.to_i + config.vm.define role do |node| + provision(node.vm, role, role_num, i) end end end diff --git a/tests/e2e/secretsencryption_old/secretsencryption_test.go b/tests/e2e/secretsencryption_old/secretsencryption_test.go index a0b7d7c68e9e..b52726834884 100644 --- a/tests/e2e/secretsencryption_old/secretsencryption_test.go +++ b/tests/e2e/secretsencryption_old/secretsencryption_test.go @@ -12,8 +12,8 @@ import ( . "github.com/onsi/gomega" ) -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +// Valid nodeOS: generic/ubuntu2204, opensuse/Leap-15.3.x86_64 +var nodeOS = flag.String("nodeOS", "generic/ubuntu2204", "VM operating system") var serverCount = flag.Int("serverCount", 3, "number of server nodes") var hardened = flag.Bool("hardened", false, "true or false") var ci = flag.Bool("ci", false, "running on CI") diff --git a/tests/e2e/snapshotrestore/Vagrantfile b/tests/e2e/snapshotrestore/Vagrantfile index 9d9f1b4466fc..21da25ecd94f 100644 --- a/tests/e2e/snapshotrestore/Vagrantfile +++ b/tests/e2e/snapshotrestore/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-0", "server-1", "server-2", "agent-0", "agent-1"]) NODE_BOXES = (ENV['E2E_NODE_BOXES'] || - ['generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004']) + ['generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204']) GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") GOCOVER = (ENV['E2E_GOCOVER'] || "") @@ -95,13 +95,10 @@ Vagrant.configure("2") do |config| NODE_BOXES = NODE_BOXES.split(" ", -1) end - # Must iterate on the index, vagrant does not understand iterating - # over the node roles themselves - NODE_ROLES.length.times do |i| - name = NODE_ROLES[i] - role_num = name.split("-", -1).pop.to_i - config.vm.define name do |node| - provision(node.vm, name, role_num, i) + NODE_ROLES.each_with_index do |role, i| + role_num = role.split("-", -1).pop.to_i + config.vm.define role do |node| + provision(node.vm, role, role_num, i) end end end diff --git a/tests/e2e/snapshotrestore/snapshotrestore_test.go b/tests/e2e/snapshotrestore/snapshotrestore_test.go index 4037e5945e23..4cf9b4c754ff 100644 --- a/tests/e2e/snapshotrestore/snapshotrestore_test.go +++ b/tests/e2e/snapshotrestore/snapshotrestore_test.go @@ -14,10 +14,10 @@ import ( ) // Valid nodeOS: -// generic/ubuntu2004, generic/centos7, generic/rocky8, +// generic/ubuntu2204, generic/centos7, generic/rocky8, // opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +var nodeOS = flag.String("nodeOS", "generic/ubuntu2204", "VM operating system") var serverCount = flag.Int("serverCount", 3, "number of server nodes") var agentCount = flag.Int("agentCount", 1, "number of agent nodes") var hardened = flag.Bool("hardened", false, "true or false") diff --git a/tests/e2e/splitserver/Vagrantfile b/tests/e2e/splitserver/Vagrantfile index e88aaa01ef6e..c6c8671a6415 100644 --- a/tests/e2e/splitserver/Vagrantfile +++ b/tests/e2e/splitserver/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-etcd-0", "server-etcd-1", "server-etcd-2", "server-cp-0", "server-cp-1", "agent-0"]) NODE_BOXES = (ENV['E2E_NODE_BOXES'] || - ['generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004']) + ['generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204']) GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") NODE_CPUS = (ENV['E2E_NODE_CPUS'] || 2).to_i @@ -115,13 +115,10 @@ Vagrant.configure("2") do |config| NODE_BOXES = NODE_BOXES.split(" ", -1) end - # Must iterate on the index, vagrant does not understand iterating - # over the node roles themselves - NODE_ROLES.length.times do |i| - name = NODE_ROLES[i] - role_num = name.split("-", -1).pop.to_i - config.vm.define name do |node| - provision(node.vm, name, role_num, i) + NODE_ROLES.each_with_index do |role, i| + role_num = role.split("-", -1).pop.to_i + config.vm.define role do |node| + provision(node.vm, role, role_num, i) end end end diff --git a/tests/e2e/splitserver/splitserver_test.go b/tests/e2e/splitserver/splitserver_test.go index 70cf99ad073f..7c774da90050 100644 --- a/tests/e2e/splitserver/splitserver_test.go +++ b/tests/e2e/splitserver/splitserver_test.go @@ -13,8 +13,8 @@ import ( . "github.com/onsi/gomega" ) -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +// Valid nodeOS: generic/ubuntu2204, opensuse/Leap-15.3.x86_64 +var nodeOS = flag.String("nodeOS", "generic/ubuntu2204", "VM operating system") var etcdCount = flag.Int("etcdCount", 3, "number of server nodes only deploying etcd") var controlPlaneCount = flag.Int("controlPlaneCount", 1, "number of server nodes acting as control plane") var agentCount = flag.Int("agentCount", 1, "number of agent nodes") diff --git a/tests/e2e/startup/Vagrantfile b/tests/e2e/startup/Vagrantfile index 31cdb48a21ed..2e37eaf44126 100644 --- a/tests/e2e/startup/Vagrantfile +++ b/tests/e2e/startup/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-0", "agent-0"]) NODE_BOXES = (ENV['E2E_NODE_BOXES'] || - ['generic/ubuntu2004', 'generic/ubuntu2004']) + ['generic/ubuntu2204', 'generic/ubuntu2204']) GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") GOCOVER = (ENV['E2E_GOCOVER'] || "") @@ -80,13 +80,10 @@ Vagrant.configure("2") do |config| NODE_BOXES = NODE_BOXES.split(" ", -1) end - # Must iterate on the index, vagrant does not understand iterating - # over the node roles themselves - NODE_ROLES.length.times do |i| - name = NODE_ROLES[i] - role_num = name.split("-", -1).pop.to_i - config.vm.define name do |node| - provision(node.vm, name, role_num, i) + NODE_ROLES.each_with_index do |role, i| + role_num = role.split("-", -1).pop.to_i + config.vm.define role do |node| + provision(node.vm, role, role_num, i) end end end diff --git a/tests/e2e/startup/startup_test.go b/tests/e2e/startup/startup_test.go index 10a939044d72..6a408ebdf75f 100644 --- a/tests/e2e/startup/startup_test.go +++ b/tests/e2e/startup/startup_test.go @@ -12,8 +12,8 @@ import ( . "github.com/onsi/gomega" ) -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +// Valid nodeOS: generic/ubuntu2204, opensuse/Leap-15.3.x86_64 +var nodeOS = flag.String("nodeOS", "generic/ubuntu2204", "VM operating system") var ci = flag.Bool("ci", false, "running on CI") var local = flag.Bool("local", false, "deploy a locally built K3s binary") diff --git a/tests/e2e/tailscale/Vagrantfile b/tests/e2e/tailscale/Vagrantfile index e7b21ae12698..09c3c9183f06 100644 --- a/tests/e2e/tailscale/Vagrantfile +++ b/tests/e2e/tailscale/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-0", "agent-0" ]) NODE_BOXES = (ENV['E2E_NODE_BOXES'] || - ['generic/ubuntu2004', 'generic/ubuntu2004']) + ['generic/ubuntu2204', 'generic/ubuntu2204']) GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") GOCOVER = (ENV['E2E_GOCOVER'] || "") @@ -75,7 +75,7 @@ Vagrant.configure("2") do |config| # over the node roles themselves NODE_ROLES.length.times do |i| name = NODE_ROLES[i] - config.vm.define name do |node| + config.vm.define role do |node| roles = name.split("-", -1) role_num = roles.pop.to_i provision(node.vm, roles, role_num, i) diff --git a/tests/e2e/tailscale/tailscale_test.go b/tests/e2e/tailscale/tailscale_test.go index 16078392cd36..48044d5e57cc 100644 --- a/tests/e2e/tailscale/tailscale_test.go +++ b/tests/e2e/tailscale/tailscale_test.go @@ -11,8 +11,8 @@ import ( . "github.com/onsi/gomega" ) -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +// Valid nodeOS: generic/ubuntu2204, opensuse/Leap-15.3.x86_64 +var nodeOS = flag.String("nodeOS", "generic/ubuntu2204", "VM operating system") var serverCount = flag.Int("serverCount", 1, "number of server nodes") var agentCount = flag.Int("agentCount", 1, "number of agent nodes") var ci = flag.Bool("ci", false, "running on CI") diff --git a/tests/e2e/token/Vagrantfile b/tests/e2e/token/Vagrantfile index 0a61b7ac57e3..8e50e153e4f6 100644 --- a/tests/e2e/token/Vagrantfile +++ b/tests/e2e/token/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-0", "server-1", "server-2", "agent-0", "agent-1"]) NODE_BOXES = (ENV['E2E_NODE_BOXES'] || - ['generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004']) + ['generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204']) GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") GOCOVER = (ENV['E2E_GOCOVER'] || "") @@ -85,7 +85,7 @@ Vagrant.configure("2") do |config| # over the node roles themselves NODE_ROLES.length.times do |i| name = NODE_ROLES[i] - config.vm.define name do |node| + config.vm.define role do |node| roles = name.split("-", -1) role_num = roles.pop.to_i provision(node.vm, roles, role_num, i) diff --git a/tests/e2e/token/token_test.go b/tests/e2e/token/token_test.go index dc7c746859ce..1e9885838fb4 100644 --- a/tests/e2e/token/token_test.go +++ b/tests/e2e/token/token_test.go @@ -14,9 +14,9 @@ import ( ) // Valid nodeOS: -// generic/ubuntu2004, generic/centos7, generic/rocky8, opensuse/Leap-15.5.x86_64 +// generic/ubuntu2204, generic/centos7, generic/rocky8, opensuse/Leap-15.5.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +var nodeOS = flag.String("nodeOS", "generic/ubuntu2204", "VM operating system") var serverCount = flag.Int("serverCount", 3, "number of server nodes") var agentCount = flag.Int("agentCount", 2, "number of agent nodes") var ci = flag.Bool("ci", false, "running on CI") diff --git a/tests/e2e/upgradecluster/Vagrantfile b/tests/e2e/upgradecluster/Vagrantfile index a81565a4af90..fd7f99d469b7 100644 --- a/tests/e2e/upgradecluster/Vagrantfile +++ b/tests/e2e/upgradecluster/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-0", "server-1", "server-2", "agent-0", "agent-1"]) NODE_BOXES = (ENV['E2E_NODE_BOXES'] || - ['generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004']) + ['generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204']) RELEASE_CHANNEL = (ENV['E2E_RELEASE_CHANNEL'] || "latest") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") EXTERNAL_DB = (ENV['E2E_EXTERNAL_DB'] || "etcd") @@ -158,8 +158,8 @@ Vagrant.configure("2") do |config| # over the node roles themselves NODE_ROLES.length.times do |i| name = NODE_ROLES[i] - role_num = name.split("-", -1).pop.to_i - config.vm.define name do |node| + role_num = role.split("-", -1).pop.to_i + config.vm.define role do |node| provision(node.vm, name, role_num, i) end end diff --git a/tests/e2e/upgradecluster/upgradecluster_test.go b/tests/e2e/upgradecluster/upgradecluster_test.go index 8c25fb9929b3..0da2e039ba52 100644 --- a/tests/e2e/upgradecluster/upgradecluster_test.go +++ b/tests/e2e/upgradecluster/upgradecluster_test.go @@ -13,9 +13,9 @@ import ( ) // Valid nodeOS: -// generic/ubuntu2004, generic/centos7, generic/rocky8 +// generic/ubuntu2204, generic/centos7, generic/rocky8 // opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +var nodeOS = flag.String("nodeOS", "generic/ubuntu2204", "VM operating system") var serverCount = flag.Int("serverCount", 3, "number of server nodes") var agentCount = flag.Int("agentCount", 2, "number of agent nodes") var hardened = flag.Bool("hardened", false, "true or false") diff --git a/tests/e2e/validatecluster/Vagrantfile b/tests/e2e/validatecluster/Vagrantfile index 4fd3b204ea57..e6821184b040 100644 --- a/tests/e2e/validatecluster/Vagrantfile +++ b/tests/e2e/validatecluster/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-0", "server-1", "server-2", "agent-0", "agent-1"]) NODE_BOXES = (ENV['E2E_NODE_BOXES'] || - ['generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004']) + ['generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204', 'generic/ubuntu2204']) GITHUB_BRANCH = (ENV['E2E_GITHUB_BRANCH'] || "master") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") EXTERNAL_DB = (ENV['E2E_EXTERNAL_DB'] || "etcd") @@ -152,13 +152,10 @@ Vagrant.configure("2") do |config| NODE_BOXES = NODE_BOXES.split(" ", -1) end - # Must iterate on the index, vagrant does not understand iterating - # over the node roles themselves - NODE_ROLES.length.times do |i| - name = NODE_ROLES[i] - role_num = name.split("-", -1).pop.to_i - config.vm.define name do |node| - provision(node.vm, name, role_num, i) + NODE_ROLES.each_with_index do |role, i| + role_num = role.split("-", -1).pop.to_i + config.vm.define role do |node| + provision(node.vm, role, role_num, i) end end end diff --git a/tests/e2e/validatecluster/validatecluster_test.go b/tests/e2e/validatecluster/validatecluster_test.go index 5bde1b2fad97..9ca35b814b10 100644 --- a/tests/e2e/validatecluster/validatecluster_test.go +++ b/tests/e2e/validatecluster/validatecluster_test.go @@ -14,9 +14,9 @@ import ( ) // Valid nodeOS: -// generic/ubuntu2004, generic/centos7, generic/rocky8, +// generic/ubuntu2204, generic/centos7, generic/rocky8, // opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +var nodeOS = flag.String("nodeOS", "generic/ubuntu2204", "VM operating system") var serverCount = flag.Int("serverCount", 3, "number of server nodes") var agentCount = flag.Int("agentCount", 2, "number of agent nodes") var hardened = flag.Bool("hardened", false, "true or false")