Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion hack/ci/runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,11 @@ function run_bindings() {
}

function run_bud() {
$SUDO ./test/buildah-bud/run-buildah-bud-tests |& logformatter
local args=()
if [[ "$MODE" == "remote" ]]; then
args+=(--remote)
fi
$SUDO ./test/buildah-bud/run-buildah-bud-tests "${args[@]}" |& logformatter
}

function run_compose_v2() {
Expand Down
7 changes: 3 additions & 4 deletions test/buildah-bud/run-buildah-bud-tests
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,15 @@ Flags, useful for manual debugging:
# Parse command-line options (used in development only, not in CI)
do_checkout=y
do_test=y
REMOTE=
declare -a bats_filter=()
for i; do
value=$(expr "$i" : '[^=]*=\(.*\)')
case "$i" in
--no-checkout) do_checkout= ; shift;;
--no-test) do_test= ; shift;;
--filter=*) bats_filter=("--filter" "$value"); shift;;
--remote) PODBIN_NAME=remote;;
--remote) REMOTE=1;;
-h|--help) echo "$usage"; exit 0;;
*) echo "$ME: Unrecognized option '$i'" >&2; exit 1;;
esac
Expand Down Expand Up @@ -73,10 +74,8 @@ PATCHES=${BUD_TEST_DIR}/buildah-tests.diff
BUD_TEST_DIR_REL=$(dirname $(git ls-files --full-name ${BASH_SOURCE[0]}))
# Path to podman binary; again, do it before we cd
PODMAN_BINARY=$(pwd)/bin/podman
REMOTE=
# If remote, start server & change path
if [[ "${PODBIN_NAME:-}" = "remote" ]]; then
REMOTE=1
if [[ -n "$REMOTE" ]]; then
PODMAN_BINARY+="-remote"
fi

Expand Down