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

Merge pull request #1080 from baude/kpod_create.pr

Browse source 
Kpod create.pr
This commit is contained in:
Daniel J Walsh 2017-11-01 13:44:28 -04:00 • committed by GitHub
commit fe69289566
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 5197 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/helpers.bash
View file

@ -99,7 +99,7 @@ CRIO_CNI_PLUGIN=${CRIO_CNI_PLUGIN:-/opt/cni/bin/}
POD_CIDR="10.88.0.0/16"
POD_CIDR_MASK="10.88.*.*"
KPOD_OPTIONS="--root $TESTDIR/crio $STORAGE_OPTIONS --runroot $TESTDIR/crio-run --runtime ${RUNTIME_BINARY}"
KPOD_OPTIONS="--root $TESTDIR/crio $STORAGE_OPTIONS --runroot $TESTDIR/crio-run --runtime ${RUNTIME_BINARY} --conmon ${CONMON_BINARY}"
cp "$CONMON_BINARY" "$TESTDIR/conmon"