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
fe7d114c
Unverified
Commit
fe7d114c
authored
May 02, 2024
by
Derek Nola
Committed by
GitHub
May 02, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump E2E opensuse leap to 15.6, fix btrfs test (#10057)
Signed-off-by:
Derek Nola
<
derek.nola@suse.com
>
parent
0981f006
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
Vagrantfile
tests/e2e/btrfs/Vagrantfile
+1
-1
btrfs_test.go
tests/e2e/btrfs/btrfs_test.go
+2
-2
token_test.go
tests/e2e/token/token_test.go
+1
-1
Vagrantfile
tests/install/opensuse-leap/Vagrantfile
+1
-1
No files found.
tests/e2e/btrfs/Vagrantfile
View file @
fe7d114c
...
@@ -4,7 +4,7 @@ ENV['VAGRANT_LOG']="error"
...
@@ -4,7 +4,7 @@ ENV['VAGRANT_LOG']="error"
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'
]
||
[
'opensuse/Leap-15.
5
.x86_64'
])
[
'opensuse/Leap-15.
6
.x86_64'
])
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/btrfs/btrfs_test.go
View file @
fe7d114c
...
@@ -38,9 +38,9 @@ var _ = Describe("Verify that btrfs based servers work", Ordered, func() {
...
@@ -38,9 +38,9 @@ var _ = Describe("Verify that btrfs based servers work", Ordered, func() {
var
err
error
var
err
error
// OS and server are hardcoded because only openSUSE Leap 15.5 natively supports Btrfs
// OS and server are hardcoded because only openSUSE Leap 15.5 natively supports Btrfs
if
*
local
{
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
{
}
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
))
Expect
(
err
)
.
NotTo
(
HaveOccurred
(),
e2e
.
GetVagrantLog
(
err
))
fmt
.
Println
(
"CLUSTER CONFIG"
)
fmt
.
Println
(
"CLUSTER CONFIG"
)
...
...
tests/e2e/token/token_test.go
View file @
fe7d114c
...
@@ -14,7 +14,7 @@ import (
...
@@ -14,7 +14,7 @@ import (
)
)
// Valid nodeOS:
// 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
nodeOS
=
flag
.
String
(
"nodeOS"
,
"generic/ubuntu2310"
,
"VM operating system"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
var
serverCount
=
flag
.
Int
(
"serverCount"
,
3
,
"number of server nodes"
)
...
...
tests/install/opensuse-leap/Vagrantfile
View file @
fe7d114c
...
@@ -6,7 +6,7 @@ ENV['TEST_INSTALL_SH'] ||= '../../../install.sh'
...
@@ -6,7 +6,7 @@ ENV['TEST_INSTALL_SH'] ||= '../../../install.sh'
Vagrant
.
configure
(
"2"
)
do
|
config
|
Vagrant
.
configure
(
"2"
)
do
|
config
|
config
.
vagrant
.
plugins
=
[
"vagrant-k3s"
]
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
.
boot_timeout
=
ENV
[
'TEST_VM_BOOT_TIMEOUT'
]
||
600
# seconds
config
.
vm
.
synced_folder
'.'
,
'/vagrant'
,
disabled:
true
config
.
vm
.
synced_folder
'.'
,
'/vagrant'
,
disabled:
true
...
...
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