vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Also refactor setting flags for running kpod

Browse source 
* Remove duplicate definitions of storage-related flags for kpod, since
  we set them in helpers.bash now, and the other locations that were
  also setting it were doing so after loading the definitions in
  helpers.
* Set kpod storage flags after checking if we need to force use of the
  "vfs" storage driver for cri-o, to make sure kpod also ends up with
  the same override if we're using one.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai 2017-09-28 12:51:35 -04:00 • committed by umohnani8
parent e16bb3feb3
commit 2491d38e03
8 changed files with 9 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/helpers.bash
View file

@ -59,11 +59,6 @@ PIDS_LIMIT=${PIDS_LIMIT:-1024}
# Log size max limit
LOG_SIZE_MAX_LIMIT=${LOG_SIZE_MAX_LIMIT:--1}
# Options for kpod.
ROOT="${TESTDIR}/crio"
RUNROOT="${TESTDIR}/crio-run"
KPOD_OPTIONS="--root ${ROOT} --runroot ${RUNROOT} ${STORAGE_OPTS} --runtime ${RUNTIME_BINARY}"
TESTDIR=$(mktemp -d)
# kpod pull needs a configuration file for shortname pulls
@ -95,6 +90,8 @@ CRIO_CNI_PLUGIN="/opt/cni/bin/"
POD_CIDR="10.88.0.0/16"
POD_CIDR_MASK="10.88.*.*"
KPOD_OPTIONS="--root $TESTDIR/crio $STORAGE_OPTS --runroot $TESTDIR/crio-run --runtime ${RUNTIME_BINARY}"
cp "$CONMON_BINARY" "$TESTDIR/conmon"
PATH=$PATH:$TESTDIR