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

Add RUNTIME env in integration and cri test.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2019-01-28 11:06:20 -08:00
parent 4dd6735020
commit 0bd90a77ef
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/test-cri.sh
View File

@ -25,6 +25,8 @@ FOCUS=${FOCUS:-}
SKIP=${SKIP:-""} SKIP=${SKIP:-""}
# REPORT_DIR is the the directory to store test logs. # REPORT_DIR is the the directory to store test logs.
REPORT_DIR=${REPORT_DIR:-"/tmp/test-cri"} REPORT_DIR=${REPORT_DIR:-"/tmp/test-cri"}
# RUNTIME is the runtime handler to use in the test.
RUNTIME=${RUNTIME:-""}
# Check GOPATH # Check GOPATH
if [[ -z "${GOPATH}" ]]; then if [[ -z "${GOPATH}" ]]; then
@ -58,7 +60,7 @@ mkdir -p ${REPORT_DIR}
test_setup ${REPORT_DIR} test_setup ${REPORT_DIR}
# Run cri validation test # 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_exit_code=$?
test_teardown test_teardown

5
hack/test-integration.sh
View File

@ -24,6 +24,8 @@ cd ${ROOT}
FOCUS=${FOCUS:-""} FOCUS=${FOCUS:-""}
# REPORT_DIR is the the directory to store test logs. # REPORT_DIR is the the directory to store test logs.
REPORT_DIR=${REPORT_DIR:-"/tmp/test-integration"} 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" CRI_ROOT="/var/lib/containerd/io.containerd.grpc.v1.cri"
@ -33,7 +35,8 @@ test_setup ${REPORT_DIR}
# Run integration test. # Run integration test.
sudo ${ROOT}/_output/integration.test --test.run="${FOCUS}" --test.v \ sudo ${ROOT}/_output/integration.test --test.run="${FOCUS}" --test.v \
--cri-endpoint=${CONTAINERD_SOCK} \ --cri-endpoint=${CONTAINERD_SOCK} \
--cri-root=${CRI_ROOT} --cri-root=${CRI_ROOT} \
--runtime-handler=${RUNTIME}
test_exit_code=$? test_exit_code=$?