opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-01 18:49:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

vendor: bump containers/(storage, common, buildah, image)

Browse Source 
Bump containers/(storage, common, buildah and image)

Changes since 2023-01-01:
 - skip mount-cache-selinux-long-name test under remote, with
   a FIXME requesting that someone see if it can be made to work.

 - skip six tests that fail under rootless-remote

 - add new --build-arg-file option:
 - update man page

Squash of:
* cf56eb1865
* 561f082772

Signed-off-by: Ed Santiago <santiago@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Signed-off-by: Aditya R <arajan@redhat.com>
This commit is contained in:
Aditya R
2023-04-10 17:02:21 +05:30
parent c04ccdbc55
commit 260bc3ec4c
274 changed files with 19599 additions and 1689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/buildah-bud/apply-podman-deltas
View File

@@ -89,6 +89,10 @@ function skip_if_remote() {
_skip "skip_if_remote" "$@"
}
function skip_if_rootless_remote() {
_skip "skip_if_rootless_remote" "$@"
}
# END handlers
###############################################################################
# BEGIN user-customizable section
@@ -252,8 +256,18 @@ skip_if_remote "different error messages between podman & podman-remote" \
###############################################################################
# BEGIN temporary workarounds that must be reevaluated periodically
skip "Test is completely broken, see buildah issue 4396" \
"bud-multiple-platform-values"
skip_if_remote "FIXME: can this test be made to work under podman-remote?" \
"bud-with-mount-cache-like-buildkit-verify-default-selinux-option"
skip_if_rootless_remote "FIXME: #17788 tar + namespaces over http" \
"bud-http-context-with-Dockerfile" \
"bud-http-context-dir-with-Dockerfile" \
"bud-http-context-with-Containerfile"
skip_if_rootless_remote "FIXME: not sure if 17788 or some other bug" \
"bud-github-context" \
"bud with Dockerfile from stdin tar" \
"build-with-network-test"
# END temporary workarounds that must be reevaluated periodically
###############################################################################

21
test/buildah-bud/buildah-tests.diff
View File

@@ -1,15 +1,15 @@
From 49aa33946b9d5757f59c80f0b7827579c8456598 Mon Sep 17 00:00:00 2001
From d94ba4638cb37e5f1eef97d6de9faf2161696c71 Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Thu, 6 Oct 2022 17:32:59 -0600
Subject: [PATCH] tweaks for running buildah tests under podman
Signed-off-by: Ed Santiago <santiago@redhat.com>
---
tests/helpers.bash | 87 +++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 83 insertions(+), 4 deletions(-)
tests/helpers.bash | 98 ++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 94 insertions(+), 4 deletions(-)
diff --git a/tests/helpers.bash b/tests/helpers.bash
index 349145f29..40a46da4e 100644
index 349145f29..742b41629 100644
--- a/tests/helpers.bash
+++ b/tests/helpers.bash
@@ -70,6 +70,37 @@ EOF
@@ -126,7 +126,7 @@ index 349145f29..40a46da4e 100644
# without "quotes", multiple lines are glommed together into one
if [ -n "$output" ]; then
echo "$output"
@@ -621,6 +691,15 @@ function skip_if_no_docker() {
@@ -621,6 +691,26 @@ function skip_if_no_docker() {
fi
}
@@ -138,6 +138,17 @@ index 349145f29..40a46da4e 100644
+ skip "${1:-test does not work with podman-remote}"
+ fi
+}
+
+#############################
+# skip_if_rootless_remote # (only applicable for podman)
+#############################
+function skip_if_rootless_remote() {
+ if [[ -n "$REMOTE" ]]; then
+ if is_rootless; then
+ skip "${1:-test does not work with rootless podman-remote}"
+ fi
+ fi
+}
+
function start_git_daemon() {
daemondir=${TEST_SCRATCH_DIR}/git-daemon