Skip to content

Commit 926ad11

Browse files
committed
test/compose: remove cni reference
CNI is not being tested here for a long time, use a more appropriate directory name. Signed-off-by: Paul Holzinger <[email protected]>
1 parent 86a2074 commit 926ad11

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

test/compose/test-compose

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,12 @@ function start_service() {
198198

199199
# FIXME: use ${testname} subdir but we can't: 50-char limit in runroot
200200
if ! is_rootless; then
201-
rm -rf $WORKDIR/{root,runroot,cni}
201+
rm -rf $WORKDIR/{root,runroot,networks}
202202
else
203-
$PODMAN_BIN unshare rm -rf $WORKDIR/{root,runroot,cni}
203+
$PODMAN_BIN unshare rm -rf $WORKDIR/{root,runroot,networks}
204204
fi
205205
rm -f $DOCKER_SOCK
206-
mkdir --mode 0755 $WORKDIR/{root,runroot,cni}
206+
mkdir --mode 0755 $WORKDIR/{root,runroot,networks}
207207
chcon --reference=/var/lib/containers $WORKDIR/root
208208

209209
$PODMAN_BIN \
@@ -212,7 +212,7 @@ function start_service() {
212212
--root $WORKDIR/root \
213213
--runroot $WORKDIR/runroot \
214214
--cgroup-manager=systemd \
215-
--network-config-dir $WORKDIR/cni \
215+
--network-config-dir $WORKDIR/networks \
216216
system service \
217217
--time 0 unix://$DOCKER_SOCK \
218218
&> $WORKDIR/server.log &
@@ -239,7 +239,7 @@ function podman() {
239239
--storage-driver=vfs \
240240
--root $WORKDIR/root \
241241
--runroot $WORKDIR/runroot \
242-
--network-config-dir $WORKDIR/cni \
242+
--network-config-dir $WORKDIR/networks \
243243
"$@")
244244
rc=$?
245245

0 commit comments

Comments
 (0)