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
c892beca
Commit
c892beca
authored
Apr 22, 2019
by
SataQiu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix shellcheck failures of test/e2e_node/environment/setup_host.sh
parent
75d45bdf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
13 deletions
+8
-13
.shellcheck_failures
hack/.shellcheck_failures
+0
-1
setup_host.sh
test/e2e_node/environment/setup_host.sh
+8
-12
No files found.
hack/.shellcheck_failures
View file @
c892beca
...
...
@@ -69,6 +69,5 @@
./test/cmd/template-output.sh
./test/cmd/version.sh
./test/e2e_node/conformance/run_test.sh
./test/e2e_node/environment/setup_host.sh
./test/e2e_node/gubernator.sh
./test/images/image-util.sh
test/e2e_node/environment/setup_host.sh
View file @
c892beca
...
...
@@ -42,38 +42,35 @@ EOF
fi
# For coreos, disable updates
if
$(
sudo
systemctl status update-engine &>/dev/null
)
;
then
if
sudo
systemctl status update-engine &>/dev/null
;
then
sudo
systemctl mask update-engine locksmithd
fi
# Fixup sudoers require tty
sudo grep
-q
"# Defaults requiretty"
/etc/sudoers
if
[
$?
-ne
0
]
;
then
if
!
sudo grep
-q
"# Defaults requiretty"
/etc/sudoers
;
then
sudo sed
-i
's/Defaults requiretty/# Defaults requiretty/'
/etc/sudoers
fi
# Install nsenter for ubuntu images
cat
/etc/
*
-release
|
grep
"ID=ubuntu"
if
[
$?
-eq
0
]
;
then
if
cat
/etc/
*
-release
|
grep
"ID=ubuntu"
;
then
if
!
which nsenter
>
/dev/null
;
then
echo
"Do not find nsenter. Install it."
NSENTER_BUILD_DIR
=
$(
mktemp
-d
/tmp/nsenter-build-XXXXXX
)
cd
$NSENTER_BUILD_DIR
cd
"
$NSENTER_BUILD_DIR
"
||
exit
1
curl https://www.kernel.org/pub/linux/utils/util-linux/v2.31/util-linux-2.31.tar.gz |
tar
-zxf-
sudo
apt-get update
sudo
apt-get
--yes
install
make
sudo
apt-get
--yes
install
gcc
cd
util-linux-2.31
cd
util-linux-2.31
||
exit
1
./configure
--without-ncurses
make nsenter
sudo cp
nsenter /usr/local/bin
rm
-rf
$NSENTER_BUILD_DIR
rm
-rf
"
$NSENTER_BUILD_DIR
"
fi
fi
# Install docker
hash
docker 2>/dev/null
if
[
$?
-ne
0
]
;
then
if
!
hash
docker 2>/dev/null
;
then
# RHEL platforms should always install from RHEL repository
# This will install the latest supported stable docker platform on RHEL
if
[
$OS_RHEL
-eq
0
]
;
then
...
...
@@ -93,8 +90,7 @@ id jenkins || sudo useradd jenkins -m
sudo
usermod
-a
-G
docker jenkins
# install lxc
cat
/etc/
*
-release
|
grep
"ID=debian"
if
[
$?
-ne
0
]
;
then
if
!
cat
/etc/
*
-release
|
grep
"ID=debian"
;
then
hash
apt-get 2>/dev/null
if
[
$?
-ne
1
]
;
then
sudo
apt-get
install
lxc
-y
...
...
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