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
52337d5d
Commit
52337d5d
authored
May 29, 2017
by
Kubernetes Submit Queue
Committed by
GitHub
May 29, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #46502 from gmarek/run_kubemark_tests
Automatic merge from submit-queue Fix kubemark/run-e2e-tests.sh This should make most common arguments work. cc @shyamjvs
parents
d9f3ea51
0ca6aeb9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
run-e2e-tests.sh
test/kubemark/run-e2e-tests.sh
+2
-1
No files found.
test/kubemark/run-e2e-tests.sh
View file @
52337d5d
...
@@ -33,7 +33,7 @@ export KUBECONFIG="${ABSOLUTE_ROOT}/test/kubemark/resources/kubeconfig.kubemark"
...
@@ -33,7 +33,7 @@ export KUBECONFIG="${ABSOLUTE_ROOT}/test/kubemark/resources/kubeconfig.kubemark"
export
E2E_MIN_STARTUP_PODS
=
0
export
E2E_MIN_STARTUP_PODS
=
0
if
[[
-z
"
$@
"
]]
;
then
if
[[
-z
"
$@
"
]]
;
then
ARGS
=
'--ginkgo.focus=
\[Feature:Performance\
]'
ARGS
=
'--ginkgo.focus=
[Feature:Performance
]'
else
else
ARGS
=
$@
ARGS
=
$@
fi
fi
...
@@ -43,5 +43,6 @@ if [[ -f /.dockerenv ]]; then
...
@@ -43,5 +43,6 @@ if [[ -f /.dockerenv ]]; then
go run ./hack/e2e.go
--
-v
--check-version-skew
=
false
--test
--test_args
=
"--e2e-verify-service-account=false --dump-logs-on-failure=false
${
ARGS
}
"
go run ./hack/e2e.go
--
-v
--check-version-skew
=
false
--test
--test_args
=
"--e2e-verify-service-account=false --dump-logs-on-failure=false
${
ARGS
}
"
else
else
# Running locally.
# 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
${
KUBE_ROOT
}
/hack/ginkgo-e2e.sh
"--e2e-verify-service-account=false"
"--dump-logs-on-failure=false"
$ARGS
fi
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