github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #921 from Random-Liu/turn-off-fail-swap-on

Browse Source 
Turn off `--fail-swap-on` in node e2e test.
This commit is contained in:
Lantao Liu 2018-09-18 15:56:46 -07:00 committed by GitHub
commit 8d7b0e20b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hack/test-e2e-node.sh
View File

@ -32,6 +32,9 @@ REPORT_DIR=${REPORT_DIR:-"/tmp/test-e2e-node"}
UPLOAD_LOG=${UPLOAD_LOG:-false} UPLOAD_LOG=${UPLOAD_LOG:-false}
# TIMEOUT is the timeout of the test. # TIMEOUT is the timeout of the test.
TIMEOUT=${TIMEOUT:-"40m"} TIMEOUT=${TIMEOUT:-"40m"}
# FAIL_SWAP_ON makes kubelet fail when swap is on.
# Many dev environments run with swap on, so we don't fail by default.
FAIL_SWAP_ON=${FAIL_SWAP_ON:-"false"}
# Check GOPATH # Check GOPATH
if [[ -z "${GOPATH}" ]]; then if [[ -z "${GOPATH}" ]]; then
@ -79,12 +82,13 @@ mkdir -p ${REPORT_DIR}
test_setup ${REPORT_DIR} test_setup ${REPORT_DIR}
timeout "${TIMEOUT}" make test-e2e-node \ timeout "${TIMEOUT}" make test-e2e-node \
RUNTIME=remote \ RUNTIME=remote \
CONTAINER_RUNTIME_ENDPOINT=unix://${CONTAINERD_SOCK} \ CONTAINER_RUNTIME_ENDPOINT=unix://${CONTAINERD_SOCK} \
ARTIFACTS=${REPORT_DIR} \ ARTIFACTS=${REPORT_DIR} \
TEST_ARGS='--kubelet-flags=--cgroups-per-qos=true \ TEST_ARGS='--kubelet-flags=--cgroups-per-qos=true \
--kubelet-flags=--cgroup-root=/ \ --kubelet-flags=--cgroup-root=/ \
--prepull-images=false' --kubelet-flags=--fail-swap-on='${FAIL_SWAP_ON}' \
--prepull-images=false'
test_exit_code=$? test_exit_code=$?
test_teardown test_teardown