From 062abad6482f8140e5dd41a93fdc7d0dd66699e5 Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Thu, 7 Sep 2017 17:52:56 +0000
Subject: [PATCH] Run node e2e for both cron and branch update

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 .travis.yml           | 3 ++-
 hack/test-e2e-node.sh | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 004a57756..6024cc29f 100644
--- 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
index 6b9a2a308..bc871e941 100755
--- 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}