From 11db108c2bce5ccd911dc0124e759a3127e8cab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Thu, 8 Feb 2024 21:16:13 +0100 Subject: [PATCH] Fix assumptions in 'push test --force-compression"' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When we want the original image to be gzip, explicitly ask for that instead of assuming the containers.conf defaults do that. Signed-off-by: Miloslav Trmač --- test/e2e/push_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go index 1d4d03abdc59..5125418bc3d2 100644 --- a/test/e2e/push_test.go +++ b/test/e2e/push_test.go @@ -106,7 +106,7 @@ var _ = Describe("Podman push", func() { session.WaitWithDefaultTimeout() Expect(session).Should(ExitCleanly()) - push := podmanTest.Podman([]string{"push", "-q", "--tls-verify=false", "--remove-signatures", "imageone", "localhost:5000/image"}) + push := podmanTest.Podman([]string{"push", "-q", "--tls-verify=false", "--force-compression=true", "--compression-format", "gzip", "--remove-signatures", "imageone", "localhost:5000/image"}) push.WaitWithDefaultTimeout() Expect(push).Should(ExitCleanly()) @@ -115,7 +115,6 @@ var _ = Describe("Podman push", func() { skopeo.WaitWithDefaultTimeout() Expect(skopeo).Should(ExitCleanly()) output := skopeo.OutputToString() - // Default compression is gzip and push with `--force-compression=false` no traces of `zstd` should be there. Expect(output).ToNot(ContainSubstring("zstd")) push = podmanTest.Podman([]string{"push", "-q", "--tls-verify=false", "--force-compression=false", "--compression-format", "zstd", "--remove-signatures", "imageone", "localhost:5000/image"})