diff --git a/tests/e2e/mixedos/Vagrantfile b/tests/e2e/mixedos/Vagrantfile index 7efee2e646..75c742bb07 100644 --- a/tests/e2e/mixedos/Vagrantfile +++ b/tests/e2e/mixedos/Vagrantfile @@ -95,7 +95,7 @@ def provision(vm, role, role_num, node_num) # end # If using libvirt, use virt-viewer for GUI after bring up the node vm.provision :rke2, run: 'once' do |rke2| - rke2.env = [install_type] + rke2.env = install_type rke2.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321 # rke2.skip_start = true rke2.config = <<~YAML diff --git a/tests/e2e/mixedos/mixedos_test.go b/tests/e2e/mixedos/mixedos_test.go index e0ecae0c90..a798efee27 100644 --- a/tests/e2e/mixedos/mixedos_test.go +++ b/tests/e2e/mixedos/mixedos_test.go @@ -15,7 +15,7 @@ import ( // Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "operating system for linux nodes") var serverCount = flag.Int("serverCount", 1, "number of server nodes") -var linuxAgentCount = flag.Int("linuxAgentCount", 0, "number of linux agent nodes") +var linuxAgentCount = flag.Int("linuxAgentCount", 1, "number of linux agent nodes") var windowsAgentCount = flag.Int("windowsAgentCount", 1, "number of windows agent nodes") var ci = flag.Bool("ci", false, "running on CI") var local = flag.Bool("local", false, "deploy a locally built RKE2") diff --git a/tests/e2e/mixedosbgp/Vagrantfile b/tests/e2e/mixedosbgp/Vagrantfile index d55219f247..6fe1e218c2 100644 --- a/tests/e2e/mixedosbgp/Vagrantfile +++ b/tests/e2e/mixedosbgp/Vagrantfile @@ -29,7 +29,7 @@ def provision(vm, role, role_num, node_num) install_type = "Version=#{RELEASE_VERSION}" else vm.provision "shell", path: "../scripts/latest_commit.ps1", args: [GITHUB_BRANCH, "./rke2_commits.txt"] - install_type = "Commit=(Get-Content -TotalCount 1 ./rke2_commits.txt)" + install_type = "-Commit=(Get-Content -TotalCount 1 ./rke2_commits.txt)" end else if !RELEASE_VERSION.empty? @@ -100,7 +100,7 @@ def provision(vm, role, role_num, node_num) # end # If using libvirt, use virt-viewer for GUI after bring up the node vm.provision :rke2, run: 'once' do |rke2| - rke2.env = [install_type] + rke2.env = install_type rke2.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321 # rke2.skip_start = true rke2.config = <<~YAML diff --git a/tests/e2e/testutils.go b/tests/e2e/testutils.go index aa58e54d81..bb8dd3597b 100644 --- a/tests/e2e/testutils.go +++ b/tests/e2e/testutils.go @@ -93,7 +93,7 @@ func genNodeEnvs(nodeOS string, serverCount, agentCount, windowsAgentCount int) windowsAgentNames[i] = "windows-agent-" + strconv.Itoa(i) } - nodeRoles := strings.Join(serverNodeNames, " ") + " " + strings.Join(agentNodeNames, " ") + strings.Join(windowsAgentNames, " ") + nodeRoles := strings.Join(serverNodeNames, " ") + " " + strings.Join(agentNodeNames, " ") + " " + strings.Join(windowsAgentNames, " ") nodeRoles = strings.TrimSpace(nodeRoles) nodeBoxes := strings.Repeat(nodeOS+" ", serverCount+agentCount)