From 0bd90a77ef5b43ae6699a86735c46917970052e8 Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Mon, 28 Jan 2019 11:06:20 -0800
Subject: [PATCH] Add RUNTIME env in integration and cri test.

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 hack/test-cri.sh         | 4 +++-
 hack/test-integration.sh | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/hack/test-cri.sh b/hack/test-cri.sh
index 94f5853f5..c464afd6e 100755
--- a/hack/test-cri.sh
+++ b/hack/test-cri.sh
@@ -25,6 +25,8 @@ FOCUS=${FOCUS:-}
 SKIP=${SKIP:-""}
 # REPORT_DIR is the the directory to store test logs.
 REPORT_DIR=${REPORT_DIR:-"/tmp/test-cri"}
+# RUNTIME is the runtime handler to use in the test.
+RUNTIME=${RUNTIME:-""}
 
 # Check GOPATH
 if [[ -z "${GOPATH}" ]]; then
@@ -58,7 +60,7 @@ mkdir -p ${REPORT_DIR}
 test_setup ${REPORT_DIR}
 
 # Run cri validation test
-sudo env PATH=${PATH} GOPATH=${GOPATH} ${CRITEST} --runtime-endpoint=${CONTAINERD_SOCK} --ginkgo.focus="${FOCUS}" --ginkgo.skip="${SKIP}" --parallel=8
+sudo env PATH=${PATH} GOPATH=${GOPATH} ${CRITEST} --runtime-endpoint=${CONTAINERD_SOCK} --ginkgo.focus="${FOCUS}" --ginkgo.skip="${SKIP}" --parallel=8 --runtime-handler=${RUNTIME}
 test_exit_code=$?
 
 test_teardown
diff --git a/hack/test-integration.sh b/hack/test-integration.sh
index b361fe5d5..883f4dc59 100755
--- a/hack/test-integration.sh
+++ b/hack/test-integration.sh
@@ -24,6 +24,8 @@ cd ${ROOT}
 FOCUS=${FOCUS:-""}
 # REPORT_DIR is the the directory to store test logs.
 REPORT_DIR=${REPORT_DIR:-"/tmp/test-integration"}
+# RUNTIME is the runtime handler to use in the test.
+RUNTIME=${RUNTIME:-""}
 
 CRI_ROOT="/var/lib/containerd/io.containerd.grpc.v1.cri"
 
@@ -33,7 +35,8 @@ test_setup ${REPORT_DIR}
 # Run integration test.
 sudo ${ROOT}/_output/integration.test --test.run="${FOCUS}" --test.v \
   --cri-endpoint=${CONTAINERD_SOCK} \
-  --cri-root=${CRI_ROOT}
+  --cri-root=${CRI_ROOT} \
+  --runtime-handler=${RUNTIME}
 
 test_exit_code=$?