From fdc40dd9adaf7bbc6e942572fc35803b684a1f26 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Tue, 9 Jul 2024 15:47:56 +0200 Subject: [PATCH] Upgrade tests to ubuntu2310 and use nodeOS var Signed-off-by: Manuel Buil --- tests/e2e/createreport/launchresults.html | 4 ++-- tests/e2e/dnscache/Vagrantfile | 2 +- tests/e2e/dnscache/dnscache_test.go | 4 ++-- tests/e2e/dualstack/Vagrantfile | 2 +- tests/e2e/dualstack/dualstack_test.go | 4 ++-- tests/e2e/mixedos/Vagrantfile | 2 +- tests/e2e/mixedos/mixedos_test.go | 4 ++-- tests/e2e/mixedosbgp/Vagrantfile | 2 +- tests/e2e/mixedosbgp/mixedosbgp_test.go | 4 ++-- tests/e2e/multus/Vagrantfile | 2 +- tests/e2e/multus/multus_test.go | 4 ++-- tests/e2e/scripts/run_tests.sh | 15 ++++++++------- tests/e2e/splitserver/Vagrantfile | 2 +- tests/e2e/splitserver/splitserver_test.go | 4 ++-- tests/e2e/upgradecluster/Vagrantfile | 2 +- tests/e2e/upgradecluster/upgradecluster_test.go | 4 ++-- tests/e2e/validatecluster/Vagrantfile | 2 +- tests/e2e/validatecluster/validatecluster_test.go | 4 ++-- 18 files changed, 34 insertions(+), 33 deletions(-) diff --git a/tests/e2e/createreport/launchresults.html b/tests/e2e/createreport/launchresults.html index 5237ec227f..6897b7fed6 100644 --- a/tests/e2e/createreport/launchresults.html +++ b/tests/e2e/createreport/launchresults.html @@ -14,8 +14,8 @@

-

Ubuntu 20.04 Test Results

-

Rocky Linux8.7 Test Results

diff --git a/tests/e2e/dnscache/Vagrantfile b/tests/e2e/dnscache/Vagrantfile index c57e9c393f..6056d16ed0 100644 --- a/tests/e2e/dnscache/Vagrantfile +++ b/tests/e2e/dnscache/Vagrantfile @@ -1,6 +1,6 @@ ENV['VAGRANT_NO_PARALLEL'] = ENV['E2E_STANDUP_PARALLEL'] ? nil : 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-0", "agent-0" ]) -NODE_BOXES = (ENV['E2E_NODE_BOXES'] || ['generic/ubuntu2004', 'generic/ubuntu2004']) +NODE_BOXES = (ENV['E2E_NODE_BOXES'] || ['generic/ubuntu2310', 'generic/ubuntu2310']) 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/dnscache/dnscache_test.go b/tests/e2e/dnscache/dnscache_test.go index 1a7a732fb9..2dfa110497 100644 --- a/tests/e2e/dnscache/dnscache_test.go +++ b/tests/e2e/dnscache/dnscache_test.go @@ -13,8 +13,8 @@ import ( "github.com/rancher/rke2/tests/e2e" ) -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +// Valid nodeOS: generic/ubuntu2310, opensuse/Leap-15.3.x86_64 +var nodeOS = flag.String("nodeOS", "generic/ubuntu2310", "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/dualstack/Vagrantfile b/tests/e2e/dualstack/Vagrantfile index 4880418b39..7021b17004 100644 --- a/tests/e2e/dualstack/Vagrantfile +++ b/tests/e2e/dualstack/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = ENV['E2E_STANDUP_PARALLEL'] ? nil : '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/ubuntu2310', 'generic/ubuntu2310', 'generic/ubuntu2310', 'generic/ubuntu2310']) 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/dualstack/dualstack_test.go b/tests/e2e/dualstack/dualstack_test.go index e7c2c30962..38ecd21598 100644 --- a/tests/e2e/dualstack/dualstack_test.go +++ b/tests/e2e/dualstack/dualstack_test.go @@ -13,8 +13,8 @@ import ( "github.com/rancher/rke2/tests/e2e" ) -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +// Valid nodeOS: generic/ubuntu2310, opensuse/Leap-15.3.x86_64 +var nodeOS = flag.String("nodeOS", "generic/ubuntu2310", "VM operating system") var serverCount = flag.Int("serverCount", 3, "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/mixedos/Vagrantfile b/tests/e2e/mixedos/Vagrantfile index 75c742bb07..5eb61749c6 100644 --- a/tests/e2e/mixedos/Vagrantfile +++ b/tests/e2e/mixedos/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = ENV['E2E_STANDUP_PARALLEL'] ? nil : 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-0", "linux-agent-0", "windows-agent-0" ]) NODE_BOXES = (ENV['E2E_NODE_BOXES'] || -['generic/ubuntu2004', 'generic/ubuntu2004', 'jborean93/WindowsServer2022']) +['generic/ubuntu2310', 'generic/ubuntu2310', 'jborean93/WindowsServer2022']) 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/mixedos/mixedos_test.go b/tests/e2e/mixedos/mixedos_test.go index a798efee27..56d9671f4b 100644 --- a/tests/e2e/mixedos/mixedos_test.go +++ b/tests/e2e/mixedos/mixedos_test.go @@ -12,8 +12,8 @@ import ( "github.com/rancher/rke2/tests/e2e" ) -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "operating system for linux nodes") +// Valid nodeOS: generic/ubuntu2310, opensuse/Leap-15.3.x86_64 +var nodeOS = flag.String("nodeOS", "generic/ubuntu2310", "operating system for linux nodes") var serverCount = flag.Int("serverCount", 1, "number of server nodes") var linuxAgentCount = flag.Int("linuxAgentCount", 1, "number of linux agent nodes") var windowsAgentCount = flag.Int("windowsAgentCount", 1, "number of windows agent nodes") diff --git a/tests/e2e/mixedosbgp/Vagrantfile b/tests/e2e/mixedosbgp/Vagrantfile index 6fe1e218c2..427c5a5b6e 100644 --- a/tests/e2e/mixedosbgp/Vagrantfile +++ b/tests/e2e/mixedosbgp/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = ENV['E2E_STANDUP_PARALLEL'] ? nil : 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-0", "linux-agent-0", "windows-agent-0" ]) NODE_BOXES = (ENV['E2E_NODE_BOXES'] || -['generic/ubuntu2004', 'generic/ubuntu2004', 'jborean93/WindowsServer2022']) +['generic/ubuntu2310', 'generic/ubuntu2310', 'jborean93/WindowsServer2022']) 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/mixedosbgp/mixedosbgp_test.go b/tests/e2e/mixedosbgp/mixedosbgp_test.go index af3322e6b1..b1dce7adc1 100644 --- a/tests/e2e/mixedosbgp/mixedosbgp_test.go +++ b/tests/e2e/mixedosbgp/mixedosbgp_test.go @@ -12,8 +12,8 @@ import ( "github.com/rancher/rke2/tests/e2e" ) -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "operating system for linux nodes") +// Valid nodeOS: generic/ubuntu2310, opensuse/Leap-15.3.x86_64 +var nodeOS = flag.String("nodeOS", "generic/ubuntu2310", "operating system for linux nodes") var serverCount = flag.Int("serverCount", 1, "number of server nodes") var linuxAgentCount = flag.Int("linuxAgentCount", 1, "number of linux agent nodes") var windowsAgentCount = flag.Int("windowsAgentCount", 1, "number of windows agent nodes") diff --git a/tests/e2e/multus/Vagrantfile b/tests/e2e/multus/Vagrantfile index 7d16d75489..51f71fe814 100644 --- a/tests/e2e/multus/Vagrantfile +++ b/tests/e2e/multus/Vagrantfile @@ -1,6 +1,6 @@ ENV['VAGRANT_NO_PARALLEL'] = ENV['E2E_STANDUP_PARALLEL'] ? nil : 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-0", "agent-0" ]) -NODE_BOXES = (ENV['E2E_NODE_BOXES'] || ['generic/ubuntu2004', 'generic/ubuntu2004']) +NODE_BOXES = (ENV['E2E_NODE_BOXES'] || ['generic/ubuntu2310', 'generic/ubuntu2310']) 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/multus/multus_test.go b/tests/e2e/multus/multus_test.go index 24f28a3b54..3c28429b0e 100644 --- a/tests/e2e/multus/multus_test.go +++ b/tests/e2e/multus/multus_test.go @@ -13,8 +13,8 @@ import ( "github.com/rancher/rke2/tests/e2e" ) -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +// Valid nodeOS: generic/ubuntu2310, opensuse/Leap-15.3.x86_64 +var nodeOS = flag.String("nodeOS", "generic/ubuntu2310", "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/scripts/run_tests.sh b/tests/e2e/scripts/run_tests.sh index 13e2b459c3..632632145b 100755 --- a/tests/e2e/scripts/run_tests.sh +++ b/tests/e2e/scripts/run_tests.sh @@ -1,7 +1,7 @@ #!/bin/bash # Usage: ./run_tests.sh # This script runs all the rke2 e2e tests and generates a report with the log -# The generated log is placed in createreport/rke2_${date}.log +# The generated log is placed in createreport/rke2_${OS}.log # # This script must be run inside the rke2 directory where the tests exist # @@ -13,7 +13,8 @@ set -x # tests to run tests=("ciliumnokp" "dnscache" "dualstack" "mixedos" "mixedosbgp" "multus" "secretsencryption" "splitserver" "upgradecluster" "validatecluster") -date=$(date +%Y%m%d) +nodeOS=${1:-"generic/ubuntu2310"} +OS=$(echo "$nodeOS"|cut -d'/' -f2) E2E_REGISTRY=true && export E2E_REGISTRY @@ -40,21 +41,21 @@ run_tests(){ vagrant destroy -f echo "RUNNING ${tests[$i]} TEST" - /usr/local/go/bin/go test -v ${tests[$i]}_test.go -timeout=1h -json -ci |tee -a ../createreport/rke2_${date}.log + /usr/local/go/bin/go test -v ${tests[$i]}_test.go -timeout=2h -nodeOS="$nodeOS" -json -ci |tee -a ../createreport/rke2_${OS}.log popd done } -ls createreport/rke2_${date}.log 2>/dev/null && rm createreport/rke2_${date}.log +ls createreport/rke2_${OS}.log 2>/dev/null && rm createreport/rke2_${OS}.log run_tests # re-run test if first run fails and keep record of repeatedly failed test to debug -while [ -f createreport/rke2_${date}.log ] && grep -w " FAIL:" createreport/rke2_${date}.log && [ $count -le 2 ] +while [ -f createreport/rke2_${OS}.log ] && grep -w " FAIL:" createreport/rke2_${OS}.log && [ $count -le 2 ] do - cp createreport/rke2_${date}.log createreport/rke2_${date}_${count}.log + cp createreport/rke2_${OS}.log createreport/rke2_${OS}_${count}.log run_tests done # Generate report and upload to s3 bucket -cd createreport && /usr/local/go/bin/go run -v report-template-bindata.go generate_report.go -f rke2_${date}.log +cd createreport && /usr/local/go/bin/go run -v report-template-bindata.go generate_report.go -f rke2_${OS}.log diff --git a/tests/e2e/splitserver/Vagrantfile b/tests/e2e/splitserver/Vagrantfile index 0b2cff593b..c99dd4017f 100644 --- a/tests/e2e/splitserver/Vagrantfile +++ b/tests/e2e/splitserver/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = ENV['E2E_STANDUP_PARALLEL'] ? nil : 'no' NODE_ROLES = (ENV['E2E_NODE_ROLES'] || ["server-etcd-0", "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/ubuntu2310', 'generic/ubuntu2310', 'generic/ubuntu2310', 'generic/ubuntu2310', 'generic/ubuntu2310']) 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/splitserver/splitserver_test.go b/tests/e2e/splitserver/splitserver_test.go index aa330ca96c..abd4d89e87 100644 --- a/tests/e2e/splitserver/splitserver_test.go +++ b/tests/e2e/splitserver/splitserver_test.go @@ -13,8 +13,8 @@ import ( "github.com/rancher/rke2/tests/e2e" ) -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +// Valid nodeOS: generic/ubuntu2310, opensuse/Leap-15.3.x86_64 +var nodeOS = flag.String("nodeOS", "generic/ubuntu2310", "VM operating system") var etcdCount = flag.Int("etcdCount", 1, "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/upgradecluster/Vagrantfile b/tests/e2e/upgradecluster/Vagrantfile index af8bdb3631..e59b2a5483 100644 --- a/tests/e2e/upgradecluster/Vagrantfile +++ b/tests/e2e/upgradecluster/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = ENV['E2E_STANDUP_PARALLEL'] ? nil : '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/ubuntu2310', 'generic/ubuntu2310', 'generic/ubuntu2310', 'generic/ubuntu2310']) RELEASE_CHANNEL = (ENV['E2E_RELEASE_CHANNEL'] || "latest") RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") NODE_CPUS = (ENV['E2E_NODE_CPUS'] || 2).to_i diff --git a/tests/e2e/upgradecluster/upgradecluster_test.go b/tests/e2e/upgradecluster/upgradecluster_test.go index b24946b2f5..d2e6df8c92 100644 --- a/tests/e2e/upgradecluster/upgradecluster_test.go +++ b/tests/e2e/upgradecluster/upgradecluster_test.go @@ -12,8 +12,8 @@ import ( "github.com/rancher/rke2/tests/e2e" ) -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +// Valid nodeOS: generic/ubuntu2310, opensuse/Leap-15.3.x86_64 +var nodeOS = flag.String("nodeOS", "generic/ubuntu2310", "VM operating system") var serverCount = flag.Int("serverCount", 3, "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/validatecluster/Vagrantfile b/tests/e2e/validatecluster/Vagrantfile index c2a2270ad3..f52114b478 100644 --- a/tests/e2e/validatecluster/Vagrantfile +++ b/tests/e2e/validatecluster/Vagrantfile @@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = ENV['E2E_STANDUP_PARALLEL'] ? nil : '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/ubuntu2310', 'generic/ubuntu2310', 'generic/ubuntu2310', 'generic/ubuntu2310']) 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/validatecluster/validatecluster_test.go b/tests/e2e/validatecluster/validatecluster_test.go index 48ed2a1a6a..c234a91ecc 100644 --- a/tests/e2e/validatecluster/validatecluster_test.go +++ b/tests/e2e/validatecluster/validatecluster_test.go @@ -13,8 +13,8 @@ import ( "github.com/rancher/rke2/tests/e2e" ) -// Valid nodeOS: generic/ubuntu2004, opensuse/Leap-15.3.x86_64 -var nodeOS = flag.String("nodeOS", "generic/ubuntu2004", "VM operating system") +// Valid nodeOS: generic/ubuntu2310, opensuse/Leap-15.3.x86_64 +var nodeOS = flag.String("nodeOS", "generic/ubuntu2310", "VM operating system") var serverCount = flag.Int("serverCount", 3, "number of server nodes") var agentCount = flag.Int("agentCount", 1, "number of agent nodes") var ci = flag.Bool("ci", false, "running on CI")