diff options
| author | Ed Santiago <santiago@redhat.com> | 2022-07-18 14:38:44 -0600 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2022-09-09 11:59:27 +0200 |
| commit | 8e1aa7af3a3d4fac1aefa94ed4a4455ac190ead9 (patch) | |
| tree | c938d8e3d2b0e327db70a8b214c9317ce01639b2 /test/buildah-bud/apply-podman-deltas | |
| parent | eb28a1c08469d56494006d0f2c64933ab7078d01 (diff) | |
| download | podman-8e1aa7af3a3d4fac1aefa94ed4a4455ac190ead9.tar.gz podman-8e1aa7af3a3d4fac1aefa94ed4a4455ac190ead9.tar.bz2 podman-8e1aa7af3a3d4fac1aefa94ed4a4455ac190ead9.zip | |
Fixes for vendoring Buildah
This commit was automatically cherry-picked
by buildah-vendor-treadmill v0.3
from the buildah vendor treadmill PR, #13808
Changes since 2022-08-16:
- buildah 4139: minor line-number changes to the diff
file because helpers.bash got edited
- buildah 4190: skip the new test if remote
- buildah 4195: add --retry / --retry-delay
- changes to deal with vendoring gomega, units
- changes to the podman login error message in system test
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'test/buildah-bud/apply-podman-deltas')
| -rwxr-xr-x | test/buildah-bud/apply-podman-deltas | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/buildah-bud/apply-podman-deltas b/test/buildah-bud/apply-podman-deltas index 8ce58b06d..999f36bf9 100755 --- a/test/buildah-bud/apply-podman-deltas +++ b/test/buildah-bud/apply-podman-deltas @@ -235,6 +235,10 @@ skip_if_remote "envariables do not automatically work with -remote." \ skip_if_remote "FIXME FIXME FIXME: does this test make sense in remote?" \ "build-test with OCI prestart hook" +# 2022-08-17 buildah PR 4190 +skip_if_remote "Explicit request in buildah PR 4190 to skip this on remote" \ + "build: test race in updating image name while performing parallel commits" + ############################################################################### # BEGIN tests which are skipped due to actual podman or podman-remote bugs. |