Skip to content

Commit 1c61f76

Browse files
committed
CI: fix search-test flakes
Seeing constant e2e test failures today, in search tests. Reason: tests are searching for "alpine", which is common, and we're hitting pollution. Solution: search for "testdigest_v2s<x>", an image in quay under the libpod namespace. And, in other tests that rely on docker.io, switch to quay. Signed-off-by: Ed Santiago <santiago@redhat.com>
1 parent 9523692 commit 1c61f76

1 file changed

Lines changed: 24 additions & 12 deletions

File tree

test/e2e/search_test.go

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,20 @@ registries = []`
7575
})
7676

7777
It("podman search format flag", func() {
78-
search := podmanTest.Podman([]string{"search", "--format", "table {{.Index}} {{.Name}}", "alpine"})
78+
search := podmanTest.Podman([]string{"search", "--format", "table {{.Index}} {{.Name}}", "testdigest_v2s2"})
7979
search.WaitWithDefaultTimeout()
8080
Expect(search).Should(ExitCleanly())
8181
Expect(len(search.OutputToStringArray())).To(BeNumerically(">", 1))
82-
Expect(search.OutputToString()).To(ContainSubstring("docker.io/library/alpine"))
82+
Expect(search.OutputToString()).To(ContainSubstring("quay.io/libpod/testdigest_v2s2"))
8383
})
8484

8585
It("podman search format json", func() {
86-
search := podmanTest.Podman([]string{"search", "--format", "json", "busybox"})
86+
search := podmanTest.Podman([]string{"search", "--format", "json", "testdigest_v2s1"})
8787
search.WaitWithDefaultTimeout()
8888
Expect(search).Should(ExitCleanly())
8989
Expect(search.OutputToString()).To(BeValidJSON())
90-
Expect(search.OutputToString()).To(ContainSubstring("docker.io/library/busybox"))
90+
Expect(search.OutputToString()).To(ContainSubstring("quay.io/libpod/testdigest_v2s1"))
91+
Expect(search.OutputToString()).To(ContainSubstring("Test image used by buildah regression tests"))
9192

9293
// Test for https://github.com/containers/podman/issues/11894
9394
contents := make([]entities.ImageSearchReport, 0)
@@ -123,17 +124,17 @@ registries = []`
123124
})
124125

125126
It("podman search limit flag", func() {
126-
search := podmanTest.Podman([]string{"search", "docker.io/alpine"})
127+
search := podmanTest.Podman([]string{"search", "quay.io/alpine"})
127128
search.WaitWithDefaultTimeout()
128129
Expect(search).Should(ExitCleanly())
129130
Expect(len(search.OutputToStringArray())).To(BeNumerically(">", 10))
130131

131-
search = podmanTest.Podman([]string{"search", "--limit", "3", "docker.io/alpine"})
132+
search = podmanTest.Podman([]string{"search", "--limit", "3", "quay.io/alpine"})
132133
search.WaitWithDefaultTimeout()
133134
Expect(search).Should(ExitCleanly())
134135
Expect(search.OutputToStringArray()).To(HaveLen(4))
135136

136-
search = podmanTest.Podman([]string{"search", "--limit", "30", "docker.io/alpine"})
137+
search = podmanTest.Podman([]string{"search", "--limit", "30", "quay.io/alpine"})
137138
search.WaitWithDefaultTimeout()
138139
Expect(search).Should(ExitCleanly())
139140
Expect(search.OutputToStringArray()).To(HaveLen(31))
@@ -382,23 +383,34 @@ registries = []`
382383
})
383384

384385
It("podman search repository tags", func() {
385-
search := podmanTest.Podman([]string{"search", "--list-tags", "--limit", "30", "docker.io/library/alpine"})
386+
search := podmanTest.Podman([]string{"search", "--list-tags", "--limit", "30", "quay.io/podman/stable"})
386387
search.WaitWithDefaultTimeout()
387388
Expect(search).Should(ExitCleanly())
388389
Expect(search.OutputToStringArray()).To(HaveLen(31))
389390

390-
search = podmanTest.Podman([]string{"search", "--list-tags", "docker.io/library/alpine"})
391+
search = podmanTest.Podman([]string{"search", "--list-tags", "quay.io/podman/stable"})
391392
search.WaitWithDefaultTimeout()
392393
Expect(search).Should(ExitCleanly())
393394
Expect(len(search.OutputToStringArray())).To(BeNumerically(">", 2))
394395

395-
search = podmanTest.Podman([]string{"search", "--filter=is-official", "--list-tags", "docker.io/library/alpine"})
396+
search = podmanTest.Podman([]string{"search", "--filter=is-official", "--list-tags", "quay.io/podman/stable"})
396397
search.WaitWithDefaultTimeout()
397-
Expect(search).To(ExitWithError())
398+
Expect(search).To(Exit(125))
399+
Expect(search.ErrorToString()).To(ContainSubstring("filters are not applicable to list tags result"))
400+
401+
// With trailing slash
402+
search = podmanTest.Podman([]string{"search", "--list-tags", "quay.io/podman/"})
403+
search.WaitWithDefaultTimeout()
404+
Expect(search).To(Exit(125))
405+
Expect(search.OutputToStringArray()).To(BeEmpty())
406+
Expect(search.ErrorToString()).To(ContainSubstring("must be a docker reference"))
398407

399-
search = podmanTest.Podman([]string{"search", "--list-tags", "docker.io/library/"})
408+
// No trailing slash
409+
search = podmanTest.Podman([]string{"search", "--list-tags", "quay.io/podman"})
400410
search.WaitWithDefaultTimeout()
411+
Expect(search).To(Exit(125))
401412
Expect(search.OutputToStringArray()).To(BeEmpty())
413+
Expect(search.ErrorToString()).To(ContainSubstring("fetching tags list: StatusCode: 404"))
402414
})
403415

404416
It("podman search with limit over 100", func() {

0 commit comments

Comments
 (0)