diff --git a/test/e2e/pull_chunked_test.go b/test/e2e/pull_chunked_test.go index 1b198e852a..a99439f310 100644 --- a/test/e2e/pull_chunked_test.go +++ b/test/e2e/pull_chunked_test.go @@ -24,7 +24,15 @@ func pullChunkedTests() { // included in pull_test.go if podmanTest.ImageCacheFS == "vfs" { Skip("VFS does not support chunked pulls") // We could still test that we enforce DiffID correctness. } - SkipIfRootless("(podman system reset) is required for this test") + if os.Getenv("CI_DESIRED_COMPOSEFS") != "" { + // With convert_images, we use the partial pulls for all layers, and do not exercise the full pull code path. + Skip("The composefs configuration (with convert_images = true) interferes with this test's image ID expectations") + } + SkipIfRemote("(podman system reset) is required for this test") + if isRootless() { + err := podmanTest.RestoreArtifact(REGISTRY_IMAGE) + Expect(err).ToNot(HaveOccurred()) + } lock := GetPortLock(pullChunkedRegistryPort) defer lock.Unlock()