Upgrade test framework to talk to containerd sock.

Signed-off-by: Lantao Liu <lantaol@google.com>

hack/test-integration.sh

@@ -31,7 +31,10 @@ test_setup ${REPORT_DIR}
 # Run integration test.
 # Set STANDALONE_CRI_CONTAINERD so that integration test can see it.
 # Some integration test needs the env to skip itself.
-sudo STANDALONE_CRI_CONTAINERD=${STANDALONE_CRI_CONTAINERD} ${ROOT}/_output/integration.test --test.run="${FOCUS}" --test.v
+sudo ${ROOT}/_output/integration.test --test.run="${FOCUS}" --test.v \
+  --standalone-cri-containerd=${STANDALONE_CRI_CONTAINERD} \
+  --cri-containerd-endpoint=${CRICONTAINERD_SOCK}
+
 test_exit_code=$?
 
 test_teardown

hack/test-utils.sh

@@ -25,6 +25,9 @@ RESTART_WAIT_PERIOD=${RESTART_WAIT_PERIOD:-10}
 STANDALONE_CRI_CONTAINERD=${STANDALONE_CRI_CONTAINERD:-true}
 
 CRICONTAINERD_SOCK=/var/run/cri-containerd.sock
+if ! ${STANDALONE_CRI_CONTAINERD}; then
+  CRICONTAINERD_SOCK=/var/run/containerd/containerd.sock
+fi
 
 cri_containerd_pid=
 containerd_pid=