diff options
author | Ed Santiago <santiago@redhat.com> | 2021-02-09 14:33:19 -0700 |
---|---|---|
committer | Ed Santiago <santiago@redhat.com> | 2021-07-28 14:14:42 -0600 |
commit | ec9dad7e4f1547bb46c46c36bf5eb56ef5b09bb0 (patch) | |
tree | e7ac9ecd176d12eb2eef4ae68c9bf7eb9437c2ec /test/buildah-bud/make-new-buildah-diffs | |
parent | f9395ddc5ad8b32e4e9b24542f0869722f7c9743 (diff) | |
download | podman-ec9dad7e4f1547bb46c46c36bf5eb56ef5b09bb0.tar.gz podman-ec9dad7e4f1547bb46c46c36bf5eb56ef5b09bb0.tar.bz2 podman-ec9dad7e4f1547bb46c46c36bf5eb56ef5b09bb0.zip |
buildah bud tests under podman-remote
New functionality -- mostly in the diffs we apply to
buildah's helpers.bash -- to enable running buildah-bud
tests under podman-remote. The gist of it is, we start
a 'podman system service' before each test, and clean
it up on test exit.
Design decision: the diff file for helpers.bash is no
longer trailing-whitespace-clean: that ended up producing
diffs that git wouldn't apply, because in some cases
the whitespace is actually important. In order to pass CI,
we need to exclude this file from some checks.
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/buildah-bud/make-new-buildah-diffs')
-rw-r--r-- | test/buildah-bud/make-new-buildah-diffs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/test/buildah-bud/make-new-buildah-diffs b/test/buildah-bud/make-new-buildah-diffs index 11987e376..3d0a77008 100644 --- a/test/buildah-bud/make-new-buildah-diffs +++ b/test/buildah-bud/make-new-buildah-diffs @@ -56,8 +56,6 @@ if [[ -n "$patch2" ]]; then die "Internal error: I thought I checked for squashed commits, but still see $patch2" fi -# All looks good. Now write that patch into its proper place in the -# podman repo. The sed and tac mess strips trailing whitespace and -# empty lines; we need to do this to pass github CI checks. -sed -e 's/ \+$//' <0001-*.patch |\ - tac | sed -e '/./,$!d' | tac >| ../test/buildah-bud/buildah-tests.diff +# All looks good. We can now copy that patch into its proper place in the +# podman repo. +cp 0001-*.patch ../test/buildah-bud/buildah-tests.diff |