Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
c47c85e5
Unverified
Commit
c47c85e5
authored
Mar 27, 2024
by
Derek Nola
Committed by
GitHub
Mar 27, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move to ubuntu 23.10 for E2E tests (#9755)
Signed-off-by:
Derek Nola
<
derek.nola@suse.com
>
parent
b5d0d4ee
Hide whitespace changes
Inline
Side-by-side
Showing
35 changed files
with
52 additions
and
52 deletions
+52
-52
Vagrantfile
tests/e2e/dualstack/Vagrantfile
+1
-1
dualstack_test.go
tests/e2e/dualstack/dualstack_test.go
+2
-2
Vagrantfile
tests/e2e/embeddedmirror/Vagrantfile
+1
-1
embeddedmirror_test.go
tests/e2e/embeddedmirror/embeddedmirror_test.go
+2
-2
Vagrantfile
tests/e2e/externalip/Vagrantfile
+1
-1
externalip_test.go
tests/e2e/externalip/externalip_test.go
+2
-2
Vagrantfile
tests/e2e/privateregistry/Vagrantfile
+1
-1
privateregistry_test.go
tests/e2e/privateregistry/privateregistry_test.go
+2
-2
Vagrantfile
tests/e2e/rootless/Vagrantfile
+1
-1
rootless_test.go
tests/e2e/rootless/rootless_test.go
+2
-2
Vagrantfile
tests/e2e/rotateca/Vagrantfile
+1
-1
rotateca_test.go
tests/e2e/rotateca/rotateca_test.go
+2
-2
Vagrantfile
tests/e2e/s3/Vagrantfile
+1
-1
s3_test.go
tests/e2e/s3/s3_test.go
+2
-2
run_tests.sh
tests/e2e/scripts/run_tests.sh
+1
-1
Vagrantfile
tests/e2e/secretsencryption/Vagrantfile
+1
-1
secretsencryption_test.go
tests/e2e/secretsencryption/secretsencryption_test.go
+2
-2
Vagrantfile
tests/e2e/secretsencryption_old/Vagrantfile
+1
-1
secretsencryption_test.go
tests/e2e/secretsencryption_old/secretsencryption_test.go
+2
-2
Vagrantfile
tests/e2e/snapshotrestore/Vagrantfile
+1
-1
snapshotrestore_test.go
tests/e2e/snapshotrestore/snapshotrestore_test.go
+2
-2
Vagrantfile
tests/e2e/splitserver/Vagrantfile
+1
-1
splitserver_test.go
tests/e2e/splitserver/splitserver_test.go
+2
-2
Vagrantfile
tests/e2e/startup/Vagrantfile
+1
-1
startup_test.go
tests/e2e/startup/startup_test.go
+2
-2
Vagrantfile
tests/e2e/tailscale/Vagrantfile
+1
-1
tailscale_test.go
tests/e2e/tailscale/tailscale_test.go
+2
-2
Vagrantfile
tests/e2e/token/Vagrantfile
+1
-1
token_test.go
tests/e2e/token/token_test.go
+2
-2
Vagrantfile
tests/e2e/upgradecluster/Vagrantfile
+1
-1
upgradecluster_test.go
tests/e2e/upgradecluster/upgradecluster_test.go
+2
-2
Vagrantfile
tests/e2e/validatecluster/Vagrantfile
+1
-1
validatecluster_test.go
tests/e2e/validatecluster/validatecluster_test.go
+2
-2
Vagrantfile
tests/e2e/wasm/Vagrantfile
+1
-1
wasm_test.go
tests/e2e/wasm/wasm_test.go
+2
-2
No files found.
tests/e2e/dualstack/Vagrantfile
View file @
c47c85e5
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
[
"server-0"
,
"server-1"
,
"server-2"
,
"agent-0"
])
[
"server-0"
,
"server-1"
,
"server-2"
,
"agent-0"
])
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
[
'generic/ubuntu2
204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204
'
])
[
'generic/ubuntu2
310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310
'
])
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'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
...
...
tests/e2e/dualstack/dualstack_test.go
View file @
c47c85e5
...
@@ -12,8 +12,8 @@ import (
...
@@ -12,8 +12,8 @@ import (
.
"github.com/onsi/gomega"
.
"github.com/onsi/gomega"
)
)
// Valid nodeOS: generic/ubuntu2
204
, opensuse/Leap-15.3.x86_64
// Valid nodeOS: generic/ubuntu2
310
, opensuse/Leap-15.3.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
1
,
"number of agent nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
1
,
"number of agent nodes"
)
var
hardened
=
flag
.
Bool
(
"hardened"
,
false
,
"true or false"
)
var
hardened
=
flag
.
Bool
(
"hardened"
,
false
,
"true or false"
)
...
...
tests/e2e/embeddedmirror/Vagrantfile
View file @
c47c85e5
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
[
"server-0"
,
"agent-0"
])
[
"server-0"
,
"agent-0"
])
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
[
'generic/ubuntu2
204'
,
'generic/ubuntu2204
'
])
[
'generic/ubuntu2
310'
,
'generic/ubuntu2310
'
])
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'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
...
...
tests/e2e/embeddedmirror/embeddedmirror_test.go
View file @
c47c85e5
...
@@ -13,9 +13,9 @@ import (
...
@@ -13,9 +13,9 @@ import (
)
)
// Valid nodeOS:
// Valid nodeOS:
// generic/ubuntu2
204
, generic/centos7, generic/rocky8,
// generic/ubuntu2
310
, generic/centos7, generic/rocky8,
// opensuse/Leap-15.3.x86_64
// opensuse/Leap-15.3.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
1
,
"number of server nodes"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
1
,
"number of server nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
1
,
"number of agent nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
1
,
"number of agent nodes"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
...
...
tests/e2e/externalip/Vagrantfile
View file @
c47c85e5
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
[
"server-0"
,
"agent-0"
])
[
"server-0"
,
"agent-0"
])
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
[
'generic/ubuntu2
204'
,
'generic/ubuntu2204
'
])
[
'generic/ubuntu2
310'
,
'generic/ubuntu2310
'
])
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'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
...
...
tests/e2e/externalip/externalip_test.go
View file @
c47c85e5
...
@@ -17,8 +17,8 @@ import (
...
@@ -17,8 +17,8 @@ import (
.
"github.com/onsi/gomega"
.
"github.com/onsi/gomega"
)
)
// Valid nodeOS: generic/ubuntu2
204
, opensuse/Leap-15.3.x86_64
// Valid nodeOS: generic/ubuntu2
310
, opensuse/Leap-15.3.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
1
,
"number of server nodes"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
1
,
"number of server nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
1
,
"number of agent nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
1
,
"number of agent nodes"
)
var
hardened
=
flag
.
Bool
(
"hardened"
,
false
,
"true or false"
)
var
hardened
=
flag
.
Bool
(
"hardened"
,
false
,
"true or false"
)
...
...
tests/e2e/privateregistry/Vagrantfile
View file @
c47c85e5
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
[
"server-0"
,
"agent-0"
])
[
"server-0"
,
"agent-0"
])
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
[
'generic/ubuntu2
204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204
'
])
[
'generic/ubuntu2
310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310
'
])
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'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
...
...
tests/e2e/privateregistry/privateregistry_test.go
View file @
c47c85e5
...
@@ -13,9 +13,9 @@ import (
...
@@ -13,9 +13,9 @@ import (
)
)
// Valid nodeOS:
// Valid nodeOS:
// generic/ubuntu2
204
, generic/centos7, generic/rocky8,
// generic/ubuntu2
310
, generic/centos7, generic/rocky8,
// opensuse/Leap-15.3.x86_64
// opensuse/Leap-15.3.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
1
,
"number of server nodes"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
1
,
"number of server nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
1
,
"number of agent nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
1
,
"number of agent nodes"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
...
...
tests/e2e/rootless/Vagrantfile
View file @
c47c85e5
ENV
[
'VAGRANT_NO_PARALLEL'
]
=
'no'
ENV
[
'VAGRANT_NO_PARALLEL'
]
=
'no'
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
[
"server-0"
])
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
[
"server-0"
])
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
[
'generic/ubuntu2
204
'
])
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
[
'generic/ubuntu2
310
'
])
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'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
...
...
tests/e2e/rootless/rootless_test.go
View file @
c47c85e5
...
@@ -14,8 +14,8 @@ import (
...
@@ -14,8 +14,8 @@ import (
// Rootless is only valid on a single node, but requires node/kernel configuration, requiring a E2E test environment.
// Rootless is only valid on a single node, but requires node/kernel configuration, requiring a E2E test environment.
// Valid nodeOS: generic/ubuntu2
204
, opensuse/Leap-15.3.x86_64
// Valid nodeOS: generic/ubuntu2
310
, opensuse/Leap-15.3.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
var
local
=
flag
.
Bool
(
"local"
,
false
,
"deploy a locally built K3s binary"
)
var
local
=
flag
.
Bool
(
"local"
,
false
,
"deploy a locally built K3s binary"
)
...
...
tests/e2e/rotateca/Vagrantfile
View file @
c47c85e5
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
[
"server-0"
,
"server-1"
,
"server-2"
,
"agent-0"
])
[
"server-0"
,
"server-1"
,
"server-2"
,
"agent-0"
])
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
[
'generic/ubuntu2
204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204
'
])
[
'generic/ubuntu2
310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310
'
])
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'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
...
...
tests/e2e/rotateca/rotateca_test.go
View file @
c47c85e5
...
@@ -12,8 +12,8 @@ import (
...
@@ -12,8 +12,8 @@ import (
.
"github.com/onsi/gomega"
.
"github.com/onsi/gomega"
)
)
// Valid nodeOS: generic/ubuntu2
204
, opensuse/Leap-15.3.x86_64
// Valid nodeOS: generic/ubuntu2
310
, opensuse/Leap-15.3.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
1
,
"number of agent nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
1
,
"number of agent nodes"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
...
...
tests/e2e/s3/Vagrantfile
View file @
c47c85e5
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
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'
]
||
[
'generic/ubuntu2
204
'
])
[
'generic/ubuntu2
310
'
])
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'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
...
...
tests/e2e/s3/s3_test.go
View file @
c47c85e5
...
@@ -13,9 +13,9 @@ import (
...
@@ -13,9 +13,9 @@ import (
)
)
// Valid nodeOS:
// Valid nodeOS:
// generic/ubuntu2
204
, generic/centos7, generic/rocky8,
// generic/ubuntu2
310
, generic/centos7, generic/rocky8,
// opensuse/Leap-15.3.x86_64
// opensuse/Leap-15.3.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
var
local
=
flag
.
Bool
(
"local"
,
false
,
"deploy a locally built K3s binary"
)
var
local
=
flag
.
Bool
(
"local"
,
false
,
"deploy a locally built K3s binary"
)
...
...
tests/e2e/scripts/run_tests.sh
View file @
c47c85e5
#!/bin/bash
#!/bin/bash
nodeOS
=
${
1
:-
"generic/ubuntu2
204
"
}
nodeOS
=
${
1
:-
"generic/ubuntu2
310
"
}
servercount
=
${
2
:-
3
}
servercount
=
${
2
:-
3
}
agentcount
=
${
3
:-
1
}
agentcount
=
${
3
:-
1
}
db
=
${
4
:-
"etcd"
}
db
=
${
4
:-
"etcd"
}
...
...
tests/e2e/secretsencryption/Vagrantfile
View file @
c47c85e5
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
[
"server-0"
,
"server-1"
,
"server-2"
])
[
"server-0"
,
"server-1"
,
"server-2"
])
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
[
'generic/ubuntu2
204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204
'
])
[
'generic/ubuntu2
310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310
'
])
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'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
...
...
tests/e2e/secretsencryption/secretsencryption_test.go
View file @
c47c85e5
...
@@ -15,8 +15,8 @@ import (
...
@@ -15,8 +15,8 @@ import (
// This test is desigened for the new secrets-encrypt rotate-keys command,
// This test is desigened for the new secrets-encrypt rotate-keys command,
// Added in v1.28.0+k3s1
// Added in v1.28.0+k3s1
// Valid nodeOS: generic/ubuntu2
204
, opensuse/Leap-15.3.x86_64
// Valid nodeOS: generic/ubuntu2
310
, opensuse/Leap-15.3.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
hardened
=
flag
.
Bool
(
"hardened"
,
false
,
"true or false"
)
var
hardened
=
flag
.
Bool
(
"hardened"
,
false
,
"true or false"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
...
...
tests/e2e/secretsencryption_old/Vagrantfile
View file @
c47c85e5
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
[
"server-0"
,
"server-1"
,
"server-2"
])
[
"server-0"
,
"server-1"
,
"server-2"
])
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
[
'generic/ubuntu2
204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204
'
])
[
'generic/ubuntu2
310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310
'
])
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'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
...
...
tests/e2e/secretsencryption_old/secretsencryption_test.go
View file @
c47c85e5
...
@@ -12,8 +12,8 @@ import (
...
@@ -12,8 +12,8 @@ import (
.
"github.com/onsi/gomega"
.
"github.com/onsi/gomega"
)
)
// Valid nodeOS: generic/ubuntu2
204
, opensuse/Leap-15.3.x86_64
// Valid nodeOS: generic/ubuntu2
310
, opensuse/Leap-15.3.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
hardened
=
flag
.
Bool
(
"hardened"
,
false
,
"true or false"
)
var
hardened
=
flag
.
Bool
(
"hardened"
,
false
,
"true or false"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
...
...
tests/e2e/snapshotrestore/Vagrantfile
View file @
c47c85e5
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
[
"server-0"
,
"server-1"
,
"server-2"
,
"agent-0"
,
"agent-1"
])
[
"server-0"
,
"server-1"
,
"server-2"
,
"agent-0"
,
"agent-1"
])
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
[
'generic/ubuntu2
204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204
'
])
[
'generic/ubuntu2
310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310
'
])
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'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
...
...
tests/e2e/snapshotrestore/snapshotrestore_test.go
View file @
c47c85e5
...
@@ -14,10 +14,10 @@ import (
...
@@ -14,10 +14,10 @@ import (
)
)
// Valid nodeOS:
// Valid nodeOS:
// generic/ubuntu2
204
, generic/centos7, generic/rocky8,
// generic/ubuntu2
310
, generic/centos7, generic/rocky8,
// opensuse/Leap-15.3.x86_64
// opensuse/Leap-15.3.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
1
,
"number of agent nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
1
,
"number of agent nodes"
)
var
hardened
=
flag
.
Bool
(
"hardened"
,
false
,
"true or false"
)
var
hardened
=
flag
.
Bool
(
"hardened"
,
false
,
"true or false"
)
...
...
tests/e2e/splitserver/Vagrantfile
View file @
c47c85e5
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
[
"server-etcd-0"
,
"server-etcd-1"
,
"server-etcd-2"
,
"server-cp-0"
,
"server-cp-1"
,
"agent-0"
])
[
"server-etcd-0"
,
"server-etcd-1"
,
"server-etcd-2"
,
"server-cp-0"
,
"server-cp-1"
,
"agent-0"
])
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
[
'generic/ubuntu2
204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204
'
])
[
'generic/ubuntu2
310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310
'
])
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
...
...
tests/e2e/splitserver/splitserver_test.go
View file @
c47c85e5
...
@@ -13,8 +13,8 @@ import (
...
@@ -13,8 +13,8 @@ import (
.
"github.com/onsi/gomega"
.
"github.com/onsi/gomega"
)
)
// Valid nodeOS: generic/ubuntu2
204
, opensuse/Leap-15.3.x86_64
// Valid nodeOS: generic/ubuntu2
310
, opensuse/Leap-15.3.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
etcdCount
=
flag
.
Int
(
"etcdCount"
,
3
,
"number of server nodes only deploying etcd"
)
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
controlPlaneCount
=
flag
.
Int
(
"controlPlaneCount"
,
1
,
"number of server nodes acting as control plane"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
1
,
"number of agent nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
1
,
"number of agent nodes"
)
...
...
tests/e2e/startup/Vagrantfile
View file @
c47c85e5
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
[
"server-0"
,
"agent-0"
])
[
"server-0"
,
"agent-0"
])
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
[
'generic/ubuntu2
204'
,
'generic/ubuntu2204
'
])
[
'generic/ubuntu2
310'
,
'generic/ubuntu2310
'
])
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'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
...
...
tests/e2e/startup/startup_test.go
View file @
c47c85e5
...
@@ -12,8 +12,8 @@ import (
...
@@ -12,8 +12,8 @@ import (
.
"github.com/onsi/gomega"
.
"github.com/onsi/gomega"
)
)
// Valid nodeOS: generic/ubuntu2
204
, opensuse/Leap-15.3.x86_64
// Valid nodeOS: generic/ubuntu2
310
, opensuse/Leap-15.3.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
var
local
=
flag
.
Bool
(
"local"
,
false
,
"deploy a locally built K3s binary"
)
var
local
=
flag
.
Bool
(
"local"
,
false
,
"deploy a locally built K3s binary"
)
...
...
tests/e2e/tailscale/Vagrantfile
View file @
c47c85e5
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
[
"server-0"
,
"agent-0"
])
[
"server-0"
,
"agent-0"
])
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
[
'generic/ubuntu2
204'
,
'generic/ubuntu2204
'
])
[
'generic/ubuntu2
310'
,
'generic/ubuntu2310
'
])
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'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
...
...
tests/e2e/tailscale/tailscale_test.go
View file @
c47c85e5
...
@@ -11,8 +11,8 @@ import (
...
@@ -11,8 +11,8 @@ import (
.
"github.com/onsi/gomega"
.
"github.com/onsi/gomega"
)
)
// Valid nodeOS: generic/ubuntu2
204
, opensuse/Leap-15.3.x86_64
// Valid nodeOS: generic/ubuntu2
310
, opensuse/Leap-15.3.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
1
,
"number of server nodes"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
1
,
"number of server nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
1
,
"number of agent nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
1
,
"number of agent nodes"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
...
...
tests/e2e/token/Vagrantfile
View file @
c47c85e5
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
[
"server-0"
,
"server-1"
,
"server-2"
,
"agent-0"
,
"agent-1"
])
[
"server-0"
,
"server-1"
,
"server-2"
,
"agent-0"
,
"agent-1"
])
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
[
'generic/ubuntu2
204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204
'
])
[
'generic/ubuntu2
310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310
'
])
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'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
...
...
tests/e2e/token/token_test.go
View file @
c47c85e5
...
@@ -14,9 +14,9 @@ import (
...
@@ -14,9 +14,9 @@ import (
)
)
// Valid nodeOS:
// Valid nodeOS:
// generic/ubuntu2
204
, generic/centos7, generic/rocky8, opensuse/Leap-15.5.x86_64
// generic/ubuntu2
310
, generic/centos7, generic/rocky8, opensuse/Leap-15.5.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
2
,
"number of agent nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
2
,
"number of agent nodes"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
...
...
tests/e2e/upgradecluster/Vagrantfile
View file @
c47c85e5
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
[
"server-0"
,
"server-1"
,
"server-2"
,
"agent-0"
,
"agent-1"
])
[
"server-0"
,
"server-1"
,
"server-2"
,
"agent-0"
,
"agent-1"
])
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
[
'generic/ubuntu2
204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204
'
])
[
'generic/ubuntu2
310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310
'
])
RELEASE_CHANNEL
=
(
ENV
[
'E2E_RELEASE_CHANNEL'
]
||
"latest"
)
RELEASE_CHANNEL
=
(
ENV
[
'E2E_RELEASE_CHANNEL'
]
||
"latest"
)
RELEASE_VERSION
=
(
ENV
[
'E2E_RELEASE_VERSION'
]
||
""
)
RELEASE_VERSION
=
(
ENV
[
'E2E_RELEASE_VERSION'
]
||
""
)
EXTERNAL_DB
=
(
ENV
[
'E2E_EXTERNAL_DB'
]
||
"etcd"
)
EXTERNAL_DB
=
(
ENV
[
'E2E_EXTERNAL_DB'
]
||
"etcd"
)
...
...
tests/e2e/upgradecluster/upgradecluster_test.go
View file @
c47c85e5
...
@@ -13,9 +13,9 @@ import (
...
@@ -13,9 +13,9 @@ import (
)
)
// Valid nodeOS:
// Valid nodeOS:
// generic/ubuntu2
204
, generic/centos7, generic/rocky8
// generic/ubuntu2
310
, generic/centos7, generic/rocky8
// opensuse/Leap-15.3.x86_64
// opensuse/Leap-15.3.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
2
,
"number of agent nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
2
,
"number of agent nodes"
)
var
hardened
=
flag
.
Bool
(
"hardened"
,
false
,
"true or false"
)
var
hardened
=
flag
.
Bool
(
"hardened"
,
false
,
"true or false"
)
...
...
tests/e2e/validatecluster/Vagrantfile
View file @
c47c85e5
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
NODE_ROLES
=
(
ENV
[
'E2E_NODE_ROLES'
]
||
[
"server-0"
,
"server-1"
,
"server-2"
,
"agent-0"
,
"agent-1"
])
[
"server-0"
,
"server-1"
,
"server-2"
,
"agent-0"
,
"agent-1"
])
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
NODE_BOXES
=
(
ENV
[
'E2E_NODE_BOXES'
]
||
[
'generic/ubuntu2
204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204'
,
'generic/ubuntu2204
'
])
[
'generic/ubuntu2
310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310'
,
'generic/ubuntu2310
'
])
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'
]
||
""
)
EXTERNAL_DB
=
(
ENV
[
'E2E_EXTERNAL_DB'
]
||
"etcd"
)
EXTERNAL_DB
=
(
ENV
[
'E2E_EXTERNAL_DB'
]
||
"etcd"
)
...
...
tests/e2e/validatecluster/validatecluster_test.go
View file @
c47c85e5
...
@@ -14,9 +14,9 @@ import (
...
@@ -14,9 +14,9 @@ import (
)
)
// Valid nodeOS:
// Valid nodeOS:
// generic/ubuntu2
204
, generic/centos7, generic/rocky8,
// generic/ubuntu2
310
, generic/centos7, generic/rocky8,
// opensuse/Leap-15.3.x86_64
// opensuse/Leap-15.3.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
2
,
"number of agent nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
2
,
"number of agent nodes"
)
var
hardened
=
flag
.
Bool
(
"hardened"
,
false
,
"true or false"
)
var
hardened
=
flag
.
Bool
(
"hardened"
,
false
,
"true or false"
)
...
...
tests/e2e/wasm/Vagrantfile
View file @
c47c85e5
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
...
@@ -2,7 +2,7 @@ ENV['VAGRANT_NO_PARALLEL'] = 'no'
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'
]
||
[
'generic/ubuntu2
204
'
])
[
'generic/ubuntu2
310
'
])
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'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
GOCOVER
=
(
ENV
[
'E2E_GOCOVER'
]
||
""
)
...
...
tests/e2e/wasm/wasm_test.go
View file @
c47c85e5
...
@@ -12,8 +12,8 @@ import (
...
@@ -12,8 +12,8 @@ import (
.
"github.com/onsi/gomega"
.
"github.com/onsi/gomega"
)
)
// Valid nodeOS: generic/ubuntu2
204
, opensuse/Leap-15.3.x86_64
// Valid nodeOS: generic/ubuntu2
310
, opensuse/Leap-15.3.x86_64
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
204
"
,
"VM operating system"
)
var
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2
310
"
,
"VM operating system"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
1
,
"number of server nodes"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
1
,
"number of server nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
0
,
"number of agent nodes"
)
var
agentCount
=
flag
.
Int
(
"agentCount"
,
0
,
"number of agent nodes"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
var
ci
=
flag
.
Bool
(
"ci"
,
false
,
"running on CI"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment