-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #22504 from mheon/bump_buildah_fix_ci
Bump buildah to fix CI
- Loading branch information
Showing
8 changed files
with
21 additions
and
23 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
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,4 +1,4 @@ | ||
| From 716a55e6ce36c30df4dc9cde3d1b43b8c7d19c9e Mon Sep 17 00:00:00 2001 | ||
| From 09b115ea501320bde7cf979f280f42dc803aa70b Mon Sep 17 00:00:00 2001 | ||
| From: Ed Santiago <[email protected]> | ||
| Date: Thu, 6 Oct 2022 17:32:59 -0600 | ||
| Subject: [PATCH] tweaks for running buildah tests under podman | ||
|
|
@@ -9,12 +9,12 @@ Signed-off-by: Ed Santiago <[email protected]> | |
| 1 file changed, 115 insertions(+), 4 deletions(-) | ||
|
|
||
| diff --git a/tests/helpers.bash b/tests/helpers.bash | ||
| index 349145f29..3a0348f0b 100644 | ||
| index f4245c8bc..8df18c0cc 100644 | ||
| --- a/tests/helpers.bash | ||
| +++ b/tests/helpers.bash | ||
| @@ -70,6 +70,38 @@ EOF | ||
| ROOTDIR_OPTS="--root ${TEST_SCRATCH_DIR}/root --runroot ${TEST_SCRATCH_DIR}/runroot --storage-driver ${STORAGE_DRIVER}" | ||
| @@ -71,6 +71,38 @@ EOF | ||
| BUILDAH_REGISTRY_OPTS="--registries-conf ${TEST_SOURCES}/registries.conf --registries-conf-dir ${TEST_SCRATCH_DIR}/registries.d --short-name-alias-conf ${TEST_SCRATCH_DIR}/cache/shortnames.conf" | ||
| COPY_REGISTRY_OPTS="--registries-conf ${TEST_SOURCES}/registries.conf --registries-conf-dir ${TEST_SCRATCH_DIR}/registries.d --short-name-alias-conf ${TEST_SCRATCH_DIR}/cache/shortnames.conf" | ||
| PODMAN_REGISTRY_OPTS="--registries-conf ${TEST_SOURCES}/registries.conf" | ||
| + | ||
| + PODMAN_SERVER_PID= | ||
|
|
@@ -51,7 +51,7 @@ index 349145f29..3a0348f0b 100644 | |
| } | ||
|
|
||
| function starthttpd() { | ||
| @@ -113,6 +145,32 @@ function teardown_tests() { | ||
| @@ -114,6 +146,32 @@ function teardown_tests() { | ||
| stop_git_daemon | ||
| stop_registry | ||
|
|
||
|
|
@@ -84,7 +84,7 @@ index 349145f29..3a0348f0b 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. | ||
| @@ -202,7 +260,12 @@ function copy() { | ||
| @@ -203,7 +261,12 @@ function copy() { | ||
| } | ||
|
|
||
| function podman() { | ||
|
|
@@ -98,7 +98,7 @@ index 349145f29..3a0348f0b 100644 | |
| } | ||
|
|
||
| # There are various scenarios where we would like to execute `tests` as rootless user, however certain commands like `buildah mount` | ||
| @@ -266,8 +329,36 @@ function run_buildah() { | ||
| @@ -267,8 +330,36 @@ function run_buildah() { | ||
| --retry) retry=3; shift;; # retry network flakes | ||
| esac | ||
|
|
||
|
|
@@ -136,7 +136,7 @@ index 349145f29..3a0348f0b 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. | ||
| @@ -281,8 +372,8 @@ function run_buildah() { | ||
| @@ -282,8 +373,8 @@ function run_buildah() { | ||
| retry=$(( retry - 1 )) | ||
|
|
||
| # stdout is only emitted upon error; this echo is to help a debugger | ||
|
|
@@ -147,7 +147,7 @@ index 349145f29..3a0348f0b 100644 | |
| # without "quotes", multiple lines are glommed together into one | ||
| if [ -n "$output" ]; then | ||
| echo "$output" | ||
| @@ -621,6 +712,26 @@ function skip_if_no_docker() { | ||
| @@ -644,6 +735,26 @@ function skip_if_no_unshare() { | ||
| fi | ||
| } | ||
|
|
||
|
|
@@ -175,5 +175,5 @@ index 349145f29..3a0348f0b 100644 | |
| daemondir=${TEST_SCRATCH_DIR}/git-daemon | ||
| mkdir -p ${daemondir}/repo | ||
| -- | ||
| 2.39.2 | ||
| 2.44.0 | ||
|
|
||
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.
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
2730201There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
podman-next COPR build failed. @containers/packit-build please check.