opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 01:48:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20673 from edsantiago/emergency_ci_fix

Browse Source 
(Temporary) Emergency CI fix: quay search is broken
This commit is contained in:
openshift-merge-bot[bot]
2023-11-13 16:52:57 +00:00
committed by GitHub
parent b7cfceaeab 047da19b5f
commit a9a74dada2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/bindings/test/images_test.go
View File

@ -350,7 +350,7 @@ var _ = Describe("Podman images", func() {
} }
// Search with a fqdn // Search with a fqdn
reports, err = images.Search(bt.conn, "quay.io/libpod/alpine_nginx", nil) reports, err = images.Search(bt.conn, "quay.io/podman/stable", nil)
Expect(err).ToNot(HaveOccurred(), "Error in images.Search()") Expect(err).ToNot(HaveOccurred(), "Error in images.Search()")
Expect(reports).ToNot(BeEmpty()) Expect(reports).ToNot(BeEmpty())
}) })

6
test/e2e/search_test.go
View File

@ -58,16 +58,16 @@ registries = []`
}) })
It("podman search image with description", func() { It("podman search image with description", func() {
search := podmanTest.Podman([]string{"search", "quay.io/libpod/whalesay"}) search := podmanTest.Podman([]string{"search", "quay.io/podman/stable"})
search.WaitWithDefaultTimeout() search.WaitWithDefaultTimeout()
Expect(search).Should(ExitCleanly()) Expect(search).Should(ExitCleanly())
output := string(search.Out.Contents()) output := string(search.Out.Contents())
Expect(output).To(MatchRegexp(`(?m)NAME\s+DESCRIPTION$`)) Expect(output).To(MatchRegexp(`(?m)NAME\s+DESCRIPTION$`))
Expect(output).To(MatchRegexp(`(?m)quay.io/libpod/whalesay\s+Static image used for automated testing.+$`)) Expect(output).To(MatchRegexp(`(?m)quay.io/podman/stable\s+.*PODMAN logo`))
}) })
It("podman search image with --compatible", func() { It("podman search image with --compatible", func() {
search := podmanTest.Podman([]string{"search", "--compatible", "quay.io/libpod/whalesay"}) search := podmanTest.Podman([]string{"search", "--compatible", "quay.io/podman/stable"})
search.WaitWithDefaultTimeout() search.WaitWithDefaultTimeout()
Expect(search).Should(ExitCleanly()) Expect(search).Should(ExitCleanly())
output := string(search.Out.Contents()) output := string(search.Out.Contents())