Skip to content

OCPEDGE-2304: adjust olm test to pass on a degraded run #30664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jan 14, 2026
+9 −7
Merged

OCPEDGE-2304: adjust olm test to pass on a degraded run #30664

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions test/extended/olm/olm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const (
var _ = g.Describe("[sig-operator] OLM should", func() {
defer g.GinkgoRecover()

var oc = exutil.NewCLIWithoutNamespace("default")
oc := exutil.NewCLIWithoutNamespace("default")

providedAPIs := []struct {
fromAPIService bool
Expand Down Expand Up @@ -137,13 +137,12 @@ var _ = g.Describe("[sig-operator] OLM should", func() {
var _ = g.Describe("[sig-arch] ocp payload should be based on existing source", func() {
defer g.GinkgoRecover()

var oc = exutil.NewCLIWithoutNamespace("default")
oc := exutil.NewCLIWithoutNamespace("default")

// TODO: This test should be more generic and across components
// OCP-20981, [BZ 1626434]The olm/catalog binary should output the exact version info
// author: [email protected]
g.It("OLM version should contain the source commit id", func() {

oc := oc
namespace := "openshift-operator-lifecycle-manager"

Expand All @@ -158,9 +157,15 @@ var _ = g.Describe("[sig-arch] ocp payload should be based on existing source",
subPods := []string{"catalog-operator", "olm-operator", "packageserver"}

for _, v := range subPods {
podName, err := oc.AsAdmin().Run("get").Args("-n", namespace, "pods", "-l", fmt.Sprintf("app=%s", v), "-o=jsonpath={.items[0].metadata.name}").Output()
podName, err := oc.AsAdmin().Run("get").Args(
"-n", namespace, "pods", "-l", fmt.Sprintf("app=%s", v),
"-o", `go-template={{range .items}}{{if and (eq .status.phase "Running") (not .metadata.deletionTimestamp)}}{{.metadata.name}}{{"\n"}}{{end}}{{end}}`,
).Output()
o.Expect(err).NotTo(o.HaveOccurred())

podName = strings.TrimSpace(strings.Split(podName, "\n")[0])
o.Expect(podName).NotTo(o.BeEmpty(), "no Running pod found for app=%s in %s", v, namespace)

g.By(fmt.Sprintf("get olm version from pod %s", podName))
oc.SetNamespace("openshift-operator-lifecycle-manager")
olmVersion, err := oc.AsAdmin().Run("exec").Args("-n", namespace, podName, "-c", v, "--", "olm", "--version").Output()
Expand All @@ -174,7 +179,6 @@ var _ = g.Describe("[sig-arch] ocp payload should be based on existing source",

if sameCommit == "" {
sameCommit = gitCommitID

} else if gitCommitID != sameCommit {
e2e.Failf("commitIDs of components within OLM do not match, possible build anomalies")
}
Expand Down Expand Up @@ -345,7 +349,6 @@ var _ = g.Describe("[sig-operator] an end user can use OLM", func() {
e2e.Logf("Failed to check %s, error: %v, try next round", current, err)
}
return output

}, 5*time.Minute, time.Second).ShouldNot(o.BeEmpty())
})

Expand All @@ -361,6 +364,5 @@ var _ = g.Describe("[sig-operator] an end user can use OLM", func() {
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(msg).To(o.ContainSubstring("Upgradeable True"))
}

})
})