summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-06-03 10:04:47 -0400
committerGitHub <noreply@github.com>2022-06-03 10:04:47 -0400
commit8f79604864412a05d5d1b8614cb356f5b481306b (patch)
treeb469a7a32d3093e4ca0f79e5b97a11f0863b9ab2
parentf7a54088c30dd71a625527aecd740bac8086ccdb (diff)
parent2b0cb30026c6568af11c32d351b7c9dd7e9821af (diff)
downloadpodman-8f79604864412a05d5d1b8614cb356f5b481306b.tar.gz
podman-8f79604864412a05d5d1b8614cb356f5b481306b.tar.bz2
podman-8f79604864412a05d5d1b8614cb356f5b481306b.zip
Merge pull request #14475 from vrothberg/fix-14468
test/e2e/save_test.go: fix flake
-rw-r--r--test/e2e/save_test.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/test/e2e/save_test.go b/test/e2e/save_test.go
index 897e49ef7..7a1fb0fc2 100644
--- a/test/e2e/save_test.go
+++ b/test/e2e/save_test.go
@@ -226,13 +226,17 @@ default-docker:
})
It("podman save --multi-image-archive (untagged images)", func() {
- // Refer to images via ID instead of tag.
- session := podmanTest.Podman([]string{"images", "--format", "{{.ID}}"})
+ // #14468: to make execution time more predictable, save at
+ // most three images and sort them by size.
+ session := podmanTest.Podman([]string{"images", "--sort", "size", "--format", "{{.ID}}"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
ids := session.OutputToStringArray()
Expect(len(ids)).To(BeNumerically(">", 1), "We need to have *some* images to save")
+ if len(ids) > 3 {
+ ids = ids[:3]
+ }
multiImageSave(podmanTest, ids)
})
})