From 84eb640160006af7155f01e233e7ce23901eec6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Tue, 23 Jul 2024 19:45:14 +0200 Subject: [PATCH] Update encryption tests to avoid a warning if zstd:chunked is the default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is not the default _yet_, but we are testing such setups. Signed-off-by: Miloslav Trmač --- test/e2e/push_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go index 0489c4f091..0837b94aad 100644 --- a/test/e2e/push_test.go +++ b/test/e2e/push_test.go @@ -175,7 +175,9 @@ var _ = Describe("Podman push", func() { Expect(err).ToNot(HaveOccurred()) if !IsRemote() { // Remote does not support --encryption-key - push = podmanTest.Podman([]string{"push", "-q", "--encryption-key", "jwe:" + publicKeyFileName, "--tls-verify=false", "--remove-signatures", ALPINE, "localhost:5003/my-alpine"}) + // Explicitly specify compression-format because encryption and zstd:chunked together triggers a warning: + // Compression using zstd:chunked is not beneficial for encrypted layers, using plain zstd instead + push = podmanTest.Podman([]string{"push", "-q", "--encryption-key", "jwe:" + publicKeyFileName, "--tls-verify=false", "--remove-signatures", "--compression-format=zstd", ALPINE, "localhost:5003/my-alpine"}) push.WaitWithDefaultTimeout() Expect(push).Should(ExitCleanly()) } @@ -352,7 +354,9 @@ var _ = Describe("Podman push", func() { publicKeyFileName, _, err := WriteRSAKeyPair(keyFileName, bitSize) Expect(err).ToNot(HaveOccurred()) - session := podmanTest.Podman([]string{"push", "-q", "--encryption-key", "jwe:" + publicKeyFileName, ALPINE, fmt.Sprintf("oci:%s", bbdir)}) + // Explicitly specify compression-format because encryption and zstd:chunked together triggers a warning: + // Compression using zstd:chunked is not beneficial for encrypted layers, using plain zstd instead + session := podmanTest.Podman([]string{"push", "-q", "--encryption-key", "jwe:" + publicKeyFileName, "--compression-format=zstd", ALPINE, fmt.Sprintf("oci:%s", bbdir)}) session.WaitWithDefaultTimeout() Expect(session).Should(ExitCleanly())