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

Merge pull request #228 from Random-Liu/node-e2e-on-branch-update

Browse Source 
Run node e2e for both cron and branch update
This commit is contained in:
Lantao Liu 2017-09-08 16:26:56 -07:00 committed by GitHub
commit a86526a90c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -71,7 +71,8 @@ jobs:
go: 1.8.x go: 1.8.x
- stage: E2E Test - stage: E2E Test
script: script:
- test "${TRAVIS_EVENT_TYPE}" != "cron" && exit 0 || true # Skip node e2e test for pull request.
- test "${TRAVIS_PULL_REQUEST}" != "false" && exit 0 || true
- make install.deps - make install.deps
- UPLOAD_LOG=true make test-e2e-node - UPLOAD_LOG=true make test-e2e-node
go: 1.8.x go: 1.8.x

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

@ -74,6 +74,7 @@ make test-e2e-node \
CONTAINER_RUNTIME_ENDPOINT=unix:///var/run/cri-containerd.sock \ CONTAINER_RUNTIME_ENDPOINT=unix:///var/run/cri-containerd.sock \
ARTIFACTS=${REPORT_DIR} \ ARTIFACTS=${REPORT_DIR} \
TEST_ARGS='--kubelet-flags=--cgroups-per-qos=true --kubelet-flags=--cgroup-root=/' # Enable the QOS tree. TEST_ARGS='--kubelet-flags=--cgroups-per-qos=true --kubelet-flags=--cgroup-root=/' # Enable the QOS tree.
test_exit_code=$?
kill_cri_containerd kill_cri_containerd
@ -89,3 +90,5 @@ if ${UPLOAD_LOG}; then
fi fi
upload_logs_to_gcs "${UPLOAD_LOG_PATH}" "${VERSION}-$(date +%Y%m%d-%H%M%S)" "${REPORT_DIR}" upload_logs_to_gcs "${UPLOAD_LOG_PATH}" "${VERSION}-$(date +%Y%m%d-%H%M%S)" "${REPORT_DIR}"
fi fi
exit ${test_exit_code}