removes hack versions; splits update vendor and makes it optional

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
This commit is contained in:
Mike Brown
2018-02-06 19:58:28 -06:00
parent 561d045d71
commit 84139b4241
9 changed files with 67 additions and 35 deletions

3
hack/test-utils.sh Normal file → Executable file
View File

@@ -16,7 +16,6 @@
source $(dirname "${BASH_SOURCE[0]}")/utils.sh
source ${ROOT}/hack/versions
# CRI_CONTAINERD_FLAGS are the extra flags to use when start cri-containerd.
CRI_CONTAINERD_FLAGS=${CRI_CONTAINERD_FLAGS:-""}
# RESTART_WAIT_PERIOD is the period to wait before restarting cri-containerd/containerd.
@@ -34,7 +33,7 @@ containerd_pid=
# test_setup starts containerd and cri-containerd.
test_setup() {
local report_dir=$1
local report_dir=$1
if [ ! -x ${ROOT}/_output/cri-containerd ]; then
echo "cri-containerd is not built"
exit 1