forked from containers/podman
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
vendor in containers/(common,buildah,storage,image)
Changes as of 2022-04-21: - apply-podman-deltas: minor cleanup - buildah-tests.diff: deal with: . buildah containers#3894 (the registry one), which affected helpers.bash in a way that resulted in conflicts here; and . buildah containers#3917 (etchosts), which caused offset-only diffs with no conflicts - Reevaluate the bud skip list, and reenable some tests that seems to be passing now under podman: . bud with specified context ... . two tests that require a local registry (which buildah now runs) . bud with --cgroup-parent Signed-off-by: Ed Santiago <[email protected]> Signed-off-by: Daniel J Walsh <[email protected]>
- Loading branch information
Showing
41 changed files
with
1,066 additions
and
524 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| From 1a5562929a85074a7498165191558f434bb30bf1 Mon Sep 17 00:00:00 2001 | ||
| From a2cf44e9b58955d682626e95b493450242fb8394 Mon Sep 17 00:00:00 2001 | ||
| From: Ed Santiago <[email protected]> | ||
| Date: Tue, 9 Feb 2021 17:28:05 -0700 | ||
| Subject: [PATCH] tweaks for running buildah tests under podman | ||
|
|
||
| Signed-off-by: Ed Santiago <[email protected]> | ||
| --- | ||
| tests/helpers.bash | 73 +++++++++++++++++++++++++++++++++++++++++++--- | ||
| 1 file changed, 69 insertions(+), 4 deletions(-) | ||
| tests/helpers.bash | 69 ++++++++++++++++++++++++++++++++++++++++++++-- | ||
| 1 file changed, 66 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/tests/helpers.bash b/tests/helpers.bash | ||
| index 2bb6b429..0dc98a85 100644 | ||
| index b5713550..34fcfa3a 100644 | ||
| --- a/tests/helpers.bash | ||
| +++ b/tests/helpers.bash | ||
| @@ -43,6 +43,23 @@ EOF | ||
|
|
@@ -36,9 +36,9 @@ index 2bb6b429..0dc98a85 100644 | |
| } | ||
|
|
||
| function starthttpd() { | ||
| @@ -85,6 +102,12 @@ function teardown_tests() { | ||
| stophttpd | ||
| @@ -86,6 +103,12 @@ function teardown_tests() { | ||
| stop_git_daemon | ||
| stop_registry | ||
|
|
||
| + if [[ -n "$PODMAN_SERVER_PID" ]]; then | ||
| + kill $PODMAN_SERVER_PID | ||
|
|
@@ -49,22 +49,18 @@ index 2bb6b429..0dc98a85 100644 | |
| # Workaround for #1991 - buildah + overlayfs leaks mount points. | ||
| # Many tests leave behind /var/tmp/.../root/overlay and sub-mounts; | ||
| # let's find those and clean them up, otherwise 'rm -rf' fails. | ||
| @@ -157,7 +180,13 @@ function copy() { | ||
| @@ -178,6 +201,10 @@ function podman() { | ||
| command ${PODMAN_BINARY:-podman} ${PODMAN_REGISTRY_OPTS} ${ROOTDIR_OPTS} "$@" | ||
| } | ||
|
|
||
| function podman() { | ||
| - command podman ${PODMAN_REGISTRY_OPTS} ${ROOTDIR_OPTS} "$@" | ||
| + echo "# ... podman $*" >&3 | ||
| + ${PODMAN_BINARY} ${PODMAN_REGISTRY_OPTS} ${ROOTDIR_OPTS} "$@" | ||
| +function podman-remote() { | ||
| + command ${PODMAN_BINARY:-podman-remote} ${ROOTDIR_OPTS} "$@" | ||
| +} | ||
| + | ||
| +function podman-remote() { | ||
| + echo "# ... podman-remote $*" >&3 | ||
| + ${PODMAN_BINARY} ${ROOTDIR_OPTS} "$@" | ||
| } | ||
|
|
||
| # There are various scenarios where we would like to execute `tests` as rootless user, however certain commands like `buildah mount` | ||
| @@ -221,8 +250,35 @@ function run_buildah() { | ||
| # do not work in rootless session since a normal user cannot mount a filesystem unless they're in a user namespace along with its | ||
| # own mount namespace. In order to run such specific commands from a rootless session we must perform `buildah unshare`. | ||
| @@ -239,8 +266,35 @@ function run_buildah() { | ||
| --retry) retry=3; shift;; # retry network flakes | ||
| esac | ||
|
|
||
|
|
@@ -101,7 +97,7 @@ index 2bb6b429..0dc98a85 100644 | |
|
|
||
| # If session is rootless and `buildah mount` is invoked, perform unshare, | ||
| # since normal user cannot mount a filesystem unless they're in a user namespace along with its own mount namespace. | ||
| @@ -236,8 +292,8 @@ function run_buildah() { | ||
| @@ -254,8 +308,8 @@ function run_buildah() { | ||
| retry=$(( retry - 1 )) | ||
|
|
||
| # stdout is only emitted upon error; this echo is to help a debugger | ||
|
|
@@ -112,7 +108,7 @@ index 2bb6b429..0dc98a85 100644 | |
| # without "quotes", multiple lines are glommed together into one | ||
| if [ -n "$output" ]; then | ||
| echo "$output" | ||
| @@ -545,6 +601,15 @@ function skip_if_no_docker() { | ||
| @@ -587,6 +641,15 @@ function skip_if_no_docker() { | ||
| fi | ||
| } | ||
|
|
||
|
|
@@ -129,5 +125,5 @@ index 2bb6b429..0dc98a85 100644 | |
| daemondir=${TESTDIR}/git-daemon | ||
| mkdir -p ${daemondir}/repo | ||
| -- | ||
| 2.31.1 | ||
| 2.35.1 | ||
|
|
||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.