Modify kubemark run-e2e-tests.sh to run right command based on environment #41606
Conversation
k8s-ci-robot
added
the
cncf-cla: yes
|
[APPROVALNOTIFIER] This PR is APPROVED The following people have approved this PR: shyamjvs Needs approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
k8s-github-robot
added
the
approved
k8s-github-robot
added
size/S
shyamjvs
added
release-note-none
|
This change is |
test/kubemark/run-e2e-tests.sh
Outdated
| go run ./hack/e2e.go -v --check_version_skew=false --test --test_args="--e2e-verify-service-account=false --dump-logs-on-failure=false ${ARGS}" | ||
| # Just make local test easier... | ||
| # ${KUBE_ROOT}/hack/ginkgo-e2e.sh "--e2e-verify-service-account=false" "--dump-logs-on-failure=false" $ARGS | ||
| if [ -f /.dockerenv ]; then |
There was a problem hiding this comment.
prefer [[ -f /.dockerenv ]]
ref: https://google.github.io/styleguide/shell.xml?showone=Test,_%5B_and_%5B%5B#Test,_%5B_and_%5B%5B
There was a problem hiding this comment.
Fixed it. Thanks for telling this :)
… in docker/normal environment
shyamjvs
force-pushed
the
kubemark-e2e-docker-check
branch
from
ac5cfb8
to
3c9a8a3
Compare
|
lgtm (but I'm not an assignee) |
|
Let's wait for lgtm from at least one of the assignees. |
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
@k8s-bot test this [submit-queue is verifying that this PR is safe to merge] |
|
@shyamjvs: The following test(s) failed:
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
Automatic merge from submit-queue (batch tested with PRs 41606, 41475) |
In order to run-e2e-tests.sh in kubemark, we currently need to toggle comment b/w the last 2 lines of the script. This is inconvenient to change each time and sometimes this change gets accidentally included as part of a PR. It's even difficult for someone newly trying kubemark to figure this out in order to run tests. Changed the logic to use the right command based on whether the script is running from within a docker container or just locally.
cc @kubernetes/sig-scalability-misc @wojtek-t @gmarek