Also refactor setting flags for running kpod
* 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:
parent
e16bb3feb3
commit
2491d38e03
8 changed files with 9 additions and 30 deletions
|
@ -12,7 +12,7 @@ function teardown() {
|
|||
run ${KPOD_BINARY} $KPOD_OPTIONS pull "$IMAGE"
|
||||
echo "$output"
|
||||
[ "$status" -eq 0 ]
|
||||
run ${KPOD_BINARY} $KPOD_OPTIONS push "$IMAGE" containers-storage:[$ROOT]busybox:test
|
||||
run ${KPOD_BINARY} $KPOD_OPTIONS push "$IMAGE" containers-storage:[${TESTDIR}/crio]busybox:test
|
||||
echo "$output"
|
||||
[ "$status" -eq 0 ]
|
||||
run ${KPOD_BINARY} $KPOD_OPTIONS rmi "$IMAGE" busybox:test
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue