diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-07-29 08:10:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-29 08:10:36 -0400 |
| commit | 9c4b7f9772e53dc7c9aa1438006b6fc32ba31817 (patch) | |
| tree | 39b62cc6e83099b9ba8c3ccf9ffcc9dae7093a8e /test/buildah-bud/make-new-buildah-diffs | |
| parent | 0f42cce2f2b47cf04af28e468918dbabb4630679 (diff) | |
| parent | ec9dad7e4f1547bb46c46c36bf5eb56ef5b09bb0 (diff) | |
| download | podman-9c4b7f9772e53dc7c9aa1438006b6fc32ba31817.tar.gz podman-9c4b7f9772e53dc7c9aa1438006b6fc32ba31817.tar.bz2 podman-9c4b7f9772e53dc7c9aa1438006b6fc32ba31817.zip | |
Merge pull request #9887 from edsantiago/test_buildah_bud_with_remote
buildah bud tests under podman-remote
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 |