diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-05-18 10:05:03 +0200 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2021-05-20 10:21:27 +0200 |
| commit | 898a8ad28514f90e13b05707a0ead148caa33541 (patch) | |
| tree | 5992a9a2a39e17d335e8f468aa4f546c2a18c91c /test/buildah-bud/buildah-tests.diff | |
| parent | 8bc39f4a90a658e92305369cc2628e2a65874506 (diff) | |
| download | podman-898a8ad28514f90e13b05707a0ead148caa33541.tar.gz podman-898a8ad28514f90e13b05707a0ead148caa33541.tar.bz2 podman-898a8ad28514f90e13b05707a0ead148caa33541.zip | |
update c/common
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>
Diffstat (limited to 'test/buildah-bud/buildah-tests.diff')
| -rw-r--r-- | test/buildah-bud/buildah-tests.diff | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/test/buildah-bud/buildah-tests.diff b/test/buildah-bud/buildah-tests.diff index 6cda37723..fb00ddebf 100644 --- a/test/buildah-bud/buildah-tests.diff +++ b/test/buildah-bud/buildah-tests.diff @@ -1,22 +1,23 @@ -From a51192239fafdb59f26c9ddaab1ca9fcac2bb664 Mon Sep 17 00:00:00 2001 +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 | 26 +++++++++++++++++++++++--- - 1 file changed, 23 insertions(+), 3 deletions(-) + tests/helpers.bash | 28 +++++++++++++++++++++++++--- + 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/tests/helpers.bash b/tests/helpers.bash -index 4dc3a7dbda13..003575f48cec 100644 +index b85f99d3..1a827cd7 100644 --- a/tests/helpers.bash +++ b/tests/helpers.bash -@@ -140,15 +140,35 @@ function run_buildah() { +@@ -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. @@ -28,6 +29,7 @@ index 4dc3a7dbda13..003575f48cec 100644 + 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 @@ -45,9 +47,9 @@ index 4dc3a7dbda13..003575f48cec 100644 # 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} ${REGISTRY_OPTS} ${ROOTDIR_OPTS} "$@" +- 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} --registries-conf ${TESTSDIR}/registries.conf --root ${TESTDIR}/root --runroot ${TESTDIR}/runroot --storage-driver ${STORAGE_DRIVER} "$@" ++ 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" |