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
93bcacca
Commit
93bcacca
authored
Mar 18, 2024
by
Derek Nola
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
E2E setup: Only install jq when we need it
Signed-off-by:
Derek Nola
<
derek.nola@suse.com
>
parent
c98ca141
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
6 deletions
+21
-6
vagrantdefaults.rb
tests/e2e/vagrantdefaults.rb
+21
-6
No files found.
tests/e2e/vagrantdefaults.rb
View file @
93bcacca
...
...
@@ -2,20 +2,16 @@ def defaultOSConfigure(vm)
box
=
vm
.
box
.
to_s
if
box
.
include?
(
"generic/ubuntu"
)
vm
.
provision
"Set DNS"
,
type:
"shell"
,
inline:
"netplan set ethernets.eth0.nameservers.addresses=[8.8.8.8,1.1.1.1]; netplan apply"
,
run:
'once'
vm
.
provision
"Install jq"
,
type:
"shell"
,
inline:
"apt install -y jq"
elsif
box
.
include?
(
"Leap"
)
||
box
.
include?
(
"Tumbleweed"
)
vm
.
provision
"Install jq"
,
type:
"shell"
,
inline:
"zypper install -y jq"
vm
.
provision
"Install apparmor-parser"
,
type:
"shell"
,
inline:
"zypper install -y apparmor-parser"
elsif
box
.
include?
(
"rocky8"
)
||
box
.
include?
(
"rocky9"
)
vm
.
provision
"Install jq"
,
type:
"shell"
,
inline:
"dnf install -y jq"
vm
.
provision
"Disable firewall"
,
type:
"shell"
,
inline:
"systemctl stop firewalld"
elsif
box
.
include?
(
"centos7"
)
vm
.
provision
"Install jq"
,
type:
"shell"
,
inline:
"yum install -y jq"
vm
.
provision
"Disable firewall"
,
type:
"shell"
,
inline:
"systemctl stop firewalld"
elsif
box
.
include?
(
"alpine"
)
vm
.
provision
"Install tools"
,
type:
"shell"
,
inline:
"apk add
jq
coreutils"
vm
.
provision
"Install tools"
,
type:
"shell"
,
inline:
"apk add coreutils"
elsif
box
.
include?
(
"microos"
)
vm
.
provision
"Install jq"
,
type:
"shell"
,
inline:
"transactional-update pkg install -y jq"
# Add stuff here, but we always need to reload at the end
vm
.
provision
'reload'
,
run:
'once'
end
end
...
...
@@ -26,6 +22,7 @@ def getInstallType(vm, release_version, branch)
elsif
!
release_version
.
empty?
return
"INSTALL_K3S_VERSION=
#{
release_version
}
"
else
jqInstall
(
vm
)
scripts_location
=
Dir
.
exists?
(
"./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
...
...
@@ -82,6 +79,24 @@ def getHardenedArg(vm, hardened, scripts_location)
return
hardened_arg
end
def
jqInstall
(
vm
)
box
=
vm
.
box
.
to_s
if
box
.
include?
(
"generic/ubuntu"
)
vm
.
provision
"Install jq"
,
type:
"shell"
,
inline:
"apt install -y jq"
elsif
box
.
include?
(
"Leap"
)
||
box
.
include?
(
"Tumbleweed"
)
vm
.
provision
"Install jq"
,
type:
"shell"
,
inline:
"zypper install -y jq"
elsif
box
.
include?
(
"rocky8"
)
||
box
.
include?
(
"rocky9"
)
vm
.
provision
"Install jq"
,
type:
"shell"
,
inline:
"dnf install -y jq"
elsif
box
.
include?
(
"centos7"
)
vm
.
provision
"Install jq"
,
type:
"shell"
,
inline:
"yum install -y jq"
elsif
box
.
include?
(
"alpine"
)
vm
.
provision
"Install jq"
,
type:
"shell"
,
inline:
"apk add coreutils"
elsif
box
.
include?
(
"microos"
)
vm
.
provision
"Install jq"
,
type:
"shell"
,
inline:
"transactional-update pkg install -y jq"
vm
.
provision
'reload'
,
run:
'once'
end
end
def
dockerInstall
(
vm
)
vm
.
provider
"libvirt"
do
|
v
|
v
.
memory
=
NODE_MEMORY
+
1024
...
...
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