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
dba30ab2
Commit
dba30ab2
authored
May 10, 2024
by
Manuel Buil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace deprecated ruby function
Signed-off-by:
Manuel Buil
<
mbuil@suse.com
>
parent
14549535
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
31 additions
and
31 deletions
+31
-31
Vagrantfile
tests/e2e/btrfs/Vagrantfile
+1
-1
Vagrantfile
tests/e2e/dualstack/Vagrantfile
+2
-2
Vagrantfile
tests/e2e/embeddedmirror/Vagrantfile
+2
-2
Vagrantfile
tests/e2e/externalip/Vagrantfile
+2
-2
Vagrantfile
tests/e2e/privateregistry/Vagrantfile
+2
-2
Vagrantfile
tests/e2e/rootless/Vagrantfile
+2
-2
Vagrantfile
tests/e2e/rotateca/Vagrantfile
+1
-1
Vagrantfile
tests/e2e/s3/Vagrantfile
+2
-2
Vagrantfile
tests/e2e/secretsencryption/Vagrantfile
+1
-1
Vagrantfile
tests/e2e/secretsencryption_old/Vagrantfile
+1
-1
Vagrantfile
tests/e2e/snapshotrestore/Vagrantfile
+2
-2
Vagrantfile
tests/e2e/splitserver/Vagrantfile
+1
-1
Vagrantfile
tests/e2e/startup/Vagrantfile
+1
-1
Vagrantfile
tests/e2e/tailscale/Vagrantfile
+2
-2
Vagrantfile
tests/e2e/token/Vagrantfile
+2
-2
Vagrantfile
tests/e2e/upgradecluster/Vagrantfile
+2
-2
vagrantdefaults.rb
tests/e2e/vagrantdefaults.rb
+1
-1
Vagrantfile
tests/e2e/validatecluster/Vagrantfile
+2
-2
Vagrantfile
tests/e2e/wasm/Vagrantfile
+2
-2
No files found.
tests/e2e/btrfs/Vagrantfile
View file @
dba30ab2
...
...
@@ -20,7 +20,7 @@ def provision(vm, role, role_num, node_num)
vm
.
network
"private_network"
,
ip:
"
#{
NETWORK_PREFIX
}
.
#{
100
+
node_num
}
"
,
netmask:
"255.255.255.0"
vagrant_defaults
=
'../vagrantdefaults.rb'
load
vagrant_defaults
if
File
.
exist
s
?
(
vagrant_defaults
)
load
vagrant_defaults
if
File
.
exist?
(
vagrant_defaults
)
defaultOSConfigure
(
vm
)
install_type
=
getInstallType
(
vm
,
RELEASE_VERSION
,
GITHUB_BRANCH
)
...
...
tests/e2e/dualstack/Vagrantfile
View file @
dba30ab2
...
...
@@ -26,8 +26,8 @@ def provision(vm, role, role_num, node_num)
:libvirt__ipv6_address
=>
"
#{
NETWORK6_PREFIX
}
::1"
,
:libvirt__ipv6_prefix
=>
"64"
scripts_location
=
Dir
.
exist
s
?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist
s
?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
scripts_location
=
Dir
.
exist?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
load
vagrant_defaults
defaultOSConfigure
(
vm
)
...
...
tests/e2e/embeddedmirror/Vagrantfile
View file @
dba30ab2
...
...
@@ -19,8 +19,8 @@ def provision(vm, role, role_num, node_num)
node_ip
=
"
#{
NETWORK_PREFIX
}
.
#{
100
+
node_num
}
"
vm
.
network
"private_network"
,
ip:
node_ip
,
netmask:
"255.255.255.0"
scripts_location
=
Dir
.
exist
s
?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist
s
?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
scripts_location
=
Dir
.
exist?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
load
vagrant_defaults
defaultOSConfigure
(
vm
)
...
...
tests/e2e/externalip/Vagrantfile
View file @
dba30ab2
...
...
@@ -20,8 +20,8 @@ def provision(vm, role, role_num, node_num)
vm
.
network
"private_network"
,
:ip
=>
node_ip4
,
:netmask
=>
"255.255.255.0"
vm
.
network
"private_network"
,
:ip
=>
node_ip4_public
,
:netmask
=>
"255.255.255.0"
scripts_location
=
Dir
.
exist
s
?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist
s
?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
scripts_location
=
Dir
.
exist?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
load
vagrant_defaults
defaultOSConfigure
(
vm
)
...
...
tests/e2e/privateregistry/Vagrantfile
View file @
dba30ab2
...
...
@@ -19,8 +19,8 @@ def provision(vm, role, role_num, node_num)
node_ip
=
"
#{
NETWORK_PREFIX
}
.
#{
100
+
node_num
}
"
vm
.
network
"private_network"
,
ip:
node_ip
,
netmask:
"255.255.255.0"
scripts_location
=
Dir
.
exist
s
?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist
s
?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
scripts_location
=
Dir
.
exist?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
load
vagrant_defaults
defaultOSConfigure
(
vm
)
...
...
tests/e2e/rootless/Vagrantfile
View file @
dba30ab2
...
...
@@ -17,8 +17,8 @@ def provision(vm, role, role_num, node_num)
vm
.
network
"private_network"
,
ip:
"
#{
NETWORK_PREFIX
}
.
#{
100
+
node_num
}
"
,
netmask:
"255.255.255.0"
vagrant_defaults
=
'../vagrantdefaults.rb'
scripts_location
=
Dir
.
exist
s
?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
load
vagrant_defaults
if
File
.
exist
s
?
(
vagrant_defaults
)
scripts_location
=
Dir
.
exist?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
load
vagrant_defaults
if
File
.
exist?
(
vagrant_defaults
)
defaultOSConfigure
(
vm
)
addCoverageDir
(
vm
,
role
,
GOCOVER
)
...
...
tests/e2e/rotateca/Vagrantfile
View file @
dba30ab2
...
...
@@ -19,7 +19,7 @@ def provision(vm, role, role_num, node_num)
vm
.
network
"private_network"
,
ip:
"
#{
NETWORK_PREFIX
}
.
#{
100
+
node_num
}
"
,
netmask:
"255.255.255.0"
vagrant_defaults
=
'../vagrantdefaults.rb'
load
vagrant_defaults
if
File
.
exist
s
?
(
vagrant_defaults
)
load
vagrant_defaults
if
File
.
exist?
(
vagrant_defaults
)
defaultOSConfigure
(
vm
)
addCoverageDir
(
vm
,
role
,
GOCOVER
)
...
...
tests/e2e/s3/Vagrantfile
View file @
dba30ab2
...
...
@@ -19,8 +19,8 @@ def provision(vm, role, role_num, node_num)
node_ip
=
"
#{
NETWORK_PREFIX
}
.
#{
100
+
node_num
}
"
vm
.
network
"private_network"
,
ip:
node_ip
,
netmask:
"255.255.255.0"
scripts_location
=
Dir
.
exist
s
?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist
s
?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
scripts_location
=
Dir
.
exist?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
load
vagrant_defaults
defaultOSConfigure
(
vm
)
...
...
tests/e2e/secretsencryption/Vagrantfile
View file @
dba30ab2
...
...
@@ -19,7 +19,7 @@ def provision(vm, role, role_num, node_num)
vm
.
network
"private_network"
,
ip:
"
#{
NETWORK_PREFIX
}
.
#{
100
+
node_num
}
"
,
netmask:
"255.255.255.0"
vagrant_defaults
=
'../vagrantdefaults.rb'
load
vagrant_defaults
if
File
.
exist
s
?
(
vagrant_defaults
)
load
vagrant_defaults
if
File
.
exist?
(
vagrant_defaults
)
defaultOSConfigure
(
vm
)
addCoverageDir
(
vm
,
role
,
GOCOVER
)
...
...
tests/e2e/secretsencryption_old/Vagrantfile
View file @
dba30ab2
...
...
@@ -19,7 +19,7 @@ def provision(vm, role, role_num, node_num)
vm
.
network
"private_network"
,
ip:
"
#{
NETWORK_PREFIX
}
.
#{
100
+
node_num
}
"
,
netmask:
"255.255.255.0"
vagrant_defaults
=
'../vagrantdefaults.rb'
load
vagrant_defaults
if
File
.
exist
s
?
(
vagrant_defaults
)
load
vagrant_defaults
if
File
.
exist?
(
vagrant_defaults
)
defaultOSConfigure
(
vm
)
addCoverageDir
(
vm
,
role
,
GOCOVER
)
...
...
tests/e2e/snapshotrestore/Vagrantfile
View file @
dba30ab2
...
...
@@ -19,8 +19,8 @@ def provision(vm, role, role_num, node_num)
node_ip
=
"
#{
NETWORK_PREFIX
}
.
#{
100
+
node_num
}
"
vm
.
network
"private_network"
,
ip:
node_ip
,
netmask:
"255.255.255.0"
scripts_location
=
Dir
.
exist
s
?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist
s
?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
scripts_location
=
Dir
.
exist?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
load
vagrant_defaults
defaultOSConfigure
(
vm
)
...
...
tests/e2e/splitserver/Vagrantfile
View file @
dba30ab2
...
...
@@ -17,7 +17,7 @@ def provision(vm, role, role_num, node_num)
# An expanded netmask is required to allow VM<-->VM communication, virtualbox defaults to /32
vm
.
network
"private_network"
,
ip:
"
#{
NETWORK_PREFIX
}
.
#{
100
+
node_num
}
"
,
netmask:
"255.255.255.0"
vagrant_defaults
=
File
.
exist
s
?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
vagrant_defaults
=
File
.
exist?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
load
vagrant_defaults
defaultOSConfigure
(
vm
)
...
...
tests/e2e/startup/Vagrantfile
View file @
dba30ab2
...
...
@@ -19,7 +19,7 @@ def provision(vm, role, role_num, node_num)
vm
.
network
"private_network"
,
ip:
"
#{
NETWORK_PREFIX
}
.
#{
100
+
node_num
}
"
,
netmask:
"255.255.255.0"
vagrant_defaults
=
'../vagrantdefaults.rb'
load
vagrant_defaults
if
File
.
exist
s
?
(
vagrant_defaults
)
load
vagrant_defaults
if
File
.
exist?
(
vagrant_defaults
)
defaultOSConfigure
(
vm
)
dockerInstall
(
vm
)
...
...
tests/e2e/tailscale/Vagrantfile
View file @
dba30ab2
...
...
@@ -19,8 +19,8 @@ def provision(vm, roles, role_num, node_num)
node_ip4
=
"
#{
NETWORK4_PREFIX
}
.
#{
100
+
node_num
}
"
vm
.
network
"private_network"
,
ip:
node_ip4
,
netmask:
"255.255.255.0"
scripts_location
=
Dir
.
exist
s
?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist
s
?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
scripts_location
=
Dir
.
exist?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
load
vagrant_defaults
defaultOSConfigure
(
vm
)
...
...
tests/e2e/token/Vagrantfile
View file @
dba30ab2
...
...
@@ -18,8 +18,8 @@ def provision(vm, roles, role_num, node_num)
node_ip
=
"
#{
NETWORK_PREFIX
}
.
#{
100
+
node_num
}
"
vm
.
network
"private_network"
,
ip:
node_ip
,
netmask:
"255.255.255.0"
scripts_location
=
Dir
.
exist
s
?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist
s
?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
scripts_location
=
Dir
.
exist?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
load
vagrant_defaults
defaultOSConfigure
(
vm
)
...
...
tests/e2e/upgradecluster/Vagrantfile
View file @
dba30ab2
...
...
@@ -22,8 +22,8 @@ def provision(vm, role, role_num, node_num)
node_ip
=
"
#{
NETWORK_PREFIX
}
.
#{
100
+
node_num
}
"
vm
.
network
"private_network"
,
ip:
node_ip
,
netmask:
"255.255.255.0"
scripts_location
=
Dir
.
exist
s
?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist
s
?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
scripts_location
=
Dir
.
exist?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
load
vagrant_defaults
defaultOSConfigure
(
vm
)
...
...
tests/e2e/vagrantdefaults.rb
View file @
dba30ab2
...
...
@@ -25,7 +25,7 @@ def getInstallType(vm, release_version, branch, release_channel='')
return
"INSTALL_K3S_CHANNEL=
#{
release_channel
}
"
else
jqInstall
(
vm
)
scripts_location
=
Dir
.
exist
s
?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
scripts_location
=
Dir
.
exist?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
# Grabs the last 5 commit SHA's from the given branch, then purges any commits that do not have a passing CI build
# MicroOS requires it not be in a /tmp/ or other root system folder
vm
.
provision
"Get latest commit"
,
type:
"shell"
,
path:
scripts_location
+
"/latest_commit.sh"
,
args:
[
branch
,
"/tmp/k3s_commits"
]
...
...
tests/e2e/validatecluster/Vagrantfile
View file @
dba30ab2
...
...
@@ -24,8 +24,8 @@ def provision(vm, role, role_num, node_num)
node_ip
=
"
#{
NETWORK_PREFIX
}
.
#{
100
+
node_num
}
"
vm
.
network
"private_network"
,
ip:
node_ip
,
netmask:
"255.255.255.0"
scripts_location
=
Dir
.
exist
s
?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist
s
?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
scripts_location
=
Dir
.
exist?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
load
vagrant_defaults
defaultOSConfigure
(
vm
)
...
...
tests/e2e/wasm/Vagrantfile
View file @
dba30ab2
...
...
@@ -33,8 +33,8 @@ def provision(vm, role, role_num, node_num)
node_ip
=
"
#{
NETWORK_PREFIX
}
.
#{
100
+
node_num
}
"
vm
.
network
"private_network"
,
ip:
node_ip
,
netmask:
"255.255.255.0"
scripts_location
=
Dir
.
exist
s
?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist
s
?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
scripts_location
=
Dir
.
exist?
(
"./scripts"
)
?
"./scripts"
:
"../scripts"
vagrant_defaults
=
File
.
exist?
(
"./vagrantdefaults.rb"
)
?
"./vagrantdefaults.rb"
:
"../vagrantdefaults.rb"
load
vagrant_defaults
defaultOSConfigure
(
vm
)
...
...
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