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
46333a01
Unverified
Commit
46333a01
authored
Feb 04, 2019
by
Bob Killen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix shellcheck lint errors in test/kubemark/run-e2e-tests.sh
parent
adf4bf17
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
10 deletions
+11
-10
.shellcheck_failures
hack/.shellcheck_failures
+0
-1
run-e2e-tests.sh
test/kubemark/run-e2e-tests.sh
+11
-9
No files found.
hack/.shellcheck_failures
View file @
46333a01
...
...
@@ -145,7 +145,6 @@
./test/images/volume/rbd/create_block.sh
./test/images/volume/rbd/mon.sh
./test/images/volume/rbd/osd.sh
./test/kubemark/run-e2e-tests.sh
./test/kubemark/start-kubemark.sh
./test/kubemark/stop-kubemark.sh
./third_party/forked/shell2junit/sh2ju.sh
...
...
test/kubemark/run-e2e-tests.sh
View file @
46333a01
...
...
@@ -17,10 +17,10 @@
export
KUBERNETES_PROVIDER
=
"kubemark"
export
KUBE_CONFIG_FILE
=
"config-default.sh"
KUBE_ROOT
=
$(
dirname
"
${
BASH_SOURCE
}
"
)
/../..
KUBE_ROOT
=
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
/../..
# We need an absolute path to KUBE_ROOT
ABSOLUTE_ROOT
=
$(
readlink
-f
${
KUBE_ROOT
}
)
ABSOLUTE_ROOT
=
$(
readlink
-f
"
${
KUBE_ROOT
}
"
)
source
"
${
KUBE_ROOT
}
/cluster/kubemark/util.sh"
...
...
@@ -32,21 +32,23 @@ export KUBE_MASTER_URL="https://${KUBE_MASTER_IP}"
export
KUBECONFIG
=
"
${
ABSOLUTE_ROOT
}
/test/kubemark/resources/kubeconfig.kubemark"
export
E2E_MIN_STARTUP_PODS
=
0
if
[[
-z
"
$
@
"
]]
;
then
ARGS
=
'--ginkgo.focus=[Feature:Performance]'
if
[[
-z
"
$
*
"
]]
;
then
ARGS
=
(
'--ginkgo.focus=[Feature:Performance]'
)
else
ARGS
=
$@
ARGS
=
(
"
$@
"
)
fi
if
[[
"
${
ENABLE_KUBEMARK_CLUSTER_AUTOSCALER
}
"
==
"true"
]]
;
then
ARGS
=
"
${
ARGS
}
--kubemark-external-kubeconfig=
${
DEFAULT_KUBECONFIG
}
"
ARGS
+
=(
"--kubemark-external-kubeconfig=
${
DEFAULT_KUBECONFIG
}
"
)
fi
if
[[
-f
/.dockerenv
]]
;
then
# Running inside a dockerized runner.
go run ./hack/e2e.go
--
--check-version-skew
=
false
--test
--test_args
=
"--e2e-verify-service-account=false --dump-logs-on-failure=false
${
ARGS
}
"
go run ./hack/e2e.go
--
--check-version-skew
=
false
--test
--test_args
=
"--e2e-verify-service-account=false --dump-logs-on-failure=false
${
ARGS
[*]
}
"
else
# Running locally.
ARGS
=
$(
echo
$ARGS
|
sed
's/\[/\\\[/g'
|
sed
's/\]/\\\]/g'
)
${
KUBE_ROOT
}
/hack/ginkgo-e2e.sh
"--e2e-verify-service-account=false"
"--dump-logs-on-failure=false"
$ARGS
for
((
i
=
0
;
i <
${
ARGS
[@]
}
;
i++
))
;
do
ARGS[
$i
]=
"
$(
echo
"ARGS[
$i
]"
|
sed
-e
's/\[/\\\[/g'
-e
's/\]/\\\]/g'
)
"
done
"
${
KUBE_ROOT
}
/hack/ginkgo-e2e.sh"
"--e2e-verify-service-account=false"
"--dump-logs-on-failure=false"
"
${
ARGS
[@]
}
"
fi
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