mirror of
https://github.com/containers/podman.git
synced 2025-09-09 21:52:21 +08:00
898a8ad285
Update containers common to the latest HEAD. Some bug fixes in libimage forced us to have a clearer separation between ordinary images and manifest lists. Hence, when looking up manifest lists without recursing into any of their instances, we need to use `LookupManifestList()`. Also account for some other changes in c/common (e.g., the changed order in the security labels). Further vendor the latest HEAD from Buildah which is required to get the bud tests to pass. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
58 lines
2.3 KiB
Diff
58 lines
2.3 KiB
Diff
From 90c93048c9f3bdedf39c3c5ce3216ee2518220b4 Mon Sep 17 00:00:00 2001
|
|
From: Ed Santiago <santiago@redhat.com>
|
|
Date: Tue, 9 Feb 2021 17:28:05 -0700
|
|
Subject: [PATCH] tweaks for running buildah tests under podman
|
|
|
|
Signed-off-by: Ed Santiago <santiago@redhat.com>
|
|
---
|
|
tests/helpers.bash | 28 +++++++++++++++++++++++++---
|
|
1 file changed, 25 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/tests/helpers.bash b/tests/helpers.bash
|
|
index b85f99d3..1a827cd7 100644
|
|
--- a/tests/helpers.bash
|
|
+++ b/tests/helpers.bash
|
|
@@ -147,15 +147,37 @@ function run_buildah() {
|
|
--retry) retry=3; shift;; # retry network flakes
|
|
esac
|
|
|
|
+ local podman_or_buildah=${BUILDAH_BINARY}
|
|
+ local registry_opts=${BUILDAH_REGISTRY_OPTS}
|
|
+ if [[ $1 == "bud" || $1 == "build-using-dockerfile" ]]; then
|
|
+ shift
|
|
+ # podman defaults to --layers=true; buildah to --false.
|
|
+ # If command line includes explicit --layers, leave it untouched,
|
|
+ # but otherwise update command line so podman mimics buildah default.
|
|
+ if [[ "$*" =~ --layers || "$*" =~ --squash ]]; then
|
|
+ set "build" "--force-rm=false" "$@"
|
|
+ else
|
|
+ set "build" "--force-rm=false" "--layers=false" "$@"
|
|
+ fi
|
|
+ podman_or_buildah=${PODMAN_BINARY}
|
|
+ registry_opts=${PODMAN_REGISTRY_OPTS}
|
|
+
|
|
+ # podman always exits 125 where buildah exits 1 or 2
|
|
+ case $expected_rc in
|
|
+ 1|2) expected_rc=125 ;;
|
|
+ esac
|
|
+ fi
|
|
+ local cmd_basename=$(basename ${podman_or_buildah})
|
|
+
|
|
# Remember command args, for possible use in later diagnostic messages
|
|
- MOST_RECENT_BUILDAH_COMMAND="buildah $*"
|
|
+ MOST_RECENT_BUILDAH_COMMAND="$cmd_basename $*"
|
|
|
|
while [ $retry -gt 0 ]; do
|
|
retry=$(( retry - 1 ))
|
|
|
|
# stdout is only emitted upon error; this echo is to help a debugger
|
|
- echo "\$ $BUILDAH_BINARY $*"
|
|
- run timeout --foreground --kill=10 $BUILDAH_TIMEOUT ${BUILDAH_BINARY} ${BUILDAH_REGISTRY_OPTS} ${ROOTDIR_OPTS} "$@"
|
|
+ echo "\$ $cmd_basename $*"
|
|
+ run timeout --foreground --kill=10 $BUILDAH_TIMEOUT ${podman_or_buildah} ${registry_opts} ${ROOTDIR_OPTS} "$@"
|
|
# without "quotes", multiple lines are glommed together into one
|
|
if [ -n "$output" ]; then
|
|
echo "$output"
|
|
--
|
|
2.31.1
|