containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Buildah treadmill: improve wording in test-fail instructions 

Clarify, expand, fix a typo. These are the instructions
shown when the **patching** step fails, typically when
buildah's helpers.bash is changed in a way that conflicts
with our make-it-work-in-podman patches.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago 2024-10-21 12:28:35 -06:00
parent e2ebf81cb5
commit ee9c681f31
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/buildah-bud/run-buildah-bud-tests
View File

@ -199,11 +199,20 @@ if [[ -n $do_checkout ]]; then
Error applying patch file. This can happen when you vendor in a new buildah. Error applying patch file. This can happen when you vendor in a new buildah.
You will want to: You will want to:
- look for 'test/*.rej' *** START A NEW TERMINAL WINDOW! ***
*** ...so you can refer to these instructions ***
- cd test-buildah-* (into the buildah-bud test directory)
- look for 'tests/*.rej'
- resolve conflicts manually - resolve conflicts manually
- git add test/helpers.bash - git add tests/helpers.bash
- git am --continue - git am --continue
- ./make-new-buildah-diffs - ./make-new-buildah-diffs
- cd .. (back to podman source dir)
...and git-commit the new .diff file as part of your podman PR.
" "
(set -x;git am --reject <$PATCHES) (set -x;git am --reject <$PATCHES)