Skip to content

Commit

Permalink
Merge pull request FRRouting#17525 from famfo/podman-tests
Browse files Browse the repository at this point in the history
topotests: Allow runing under both docker and podman
  • Loading branch information
ton31337 authored Nov 29, 2024
2 parents 8e1231d + d87ec38 commit ee5a345
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions tests/topotests/docker/build.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/bash
#!/usr/bin/env bash
# SPDX-License-Identifier: MIT
#
# Copyright 2018 Network Device Education Foundation, Inc. ("NetDEF")

cd "$(dirname "$0")"/..

exec docker build --pull \
exec $(command -v docker || command -v podman) build --pull \
--compress \
-t frrouting/topotests:latest \
.
10 changes: 6 additions & 4 deletions tests/topotests/docker/frr-topotests.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
# SPDX-License-Identifier: MIT
#
# Copyright 2018 Network Device Education Foundation, Inc. ("NetDEF")
Expand Down Expand Up @@ -113,10 +113,12 @@ if [ -z "$TOPOTEST_FRR" ]; then
git -C "$TOPOTEST_FRR" ls-files -z > "${TOPOTEST_LOGS}/git-ls-files"
fi

cmd="$(command -v docker || command -v podman)"

if [ -z "$TOPOTEST_BUILDCACHE" ]; then
TOPOTEST_BUILDCACHE=topotest-buildcache
docker volume inspect "${TOPOTEST_BUILDCACHE}" &> /dev/null \
|| docker volume create "${TOPOTEST_BUILDCACHE}"
"${cmd}" volume inspect "${TOPOTEST_BUILDCACHE}" &> /dev/null \
|| "${cmd}" volume create "${TOPOTEST_BUILDCACHE}"
fi

if [[ -n "$TMUX" ]]; then
Expand Down Expand Up @@ -145,4 +147,4 @@ if [ -t 0 ]; then
set -- -t "$@"
fi

exec docker run "$@"
exec "${cmd}" run "$@"

0 comments on commit ee5a345

Please sign in to comment.