Run node e2e for both cron and branch update

Signed-off-by: Lantao Liu <lantaol@google.com>
containerd · Sep 7, 2017 · 062abad · 062abad
1 parent 7a75a91
commit 062abad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -71,7 +71,8 @@ jobs:
       go: 1.8.x
     - stage: E2E Test
       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
         - UPLOAD_LOG=true make test-e2e-node
       go: 1.8.x
diff --git a/hack/test-e2e-node.sh b/hack/test-e2e-node.sh
@@ -74,6 +74,7 @@ make test-e2e-node \
 	CONTAINER_RUNTIME_ENDPOINT=unix:///var/run/cri-containerd.sock \
 	ARTIFACTS=${REPORT_DIR} \
 	TEST_ARGS='--kubelet-flags=--cgroups-per-qos=true --kubelet-flags=--cgroup-root=/' # Enable the QOS tree.
+test_exit_code=$?
 
 kill_cri_containerd
 
@@ -89,3 +90,5 @@ if ${UPLOAD_LOG}; then
   fi
   upload_logs_to_gcs "${UPLOAD_LOG_PATH}" "${VERSION}-$(date +%Y%m%d-%H%M%S)" "${REPORT_DIR}"
 fi
+
+exit ${test_exit_code}