Skip to content

🌱 (e2e): test: skip terminating pods in catalog image update test #3703

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 2 commits into from
Dec 17, 2025
Merged

🌱 (e2e): test: skip terminating pods in catalog image update test #3703

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e9abe4
(e2e): test: skip terminating pods in catalog image update test
camilamacedo86 Nov 10, 2025
d19a774
Address reviewer comments
Dec 17, 2025
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
8 changes: 7 additions & 1 deletion test/e2e/catalog_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"

"k8s.io/apimachinery/pkg/util/intstr"

"net"
Expand Down Expand Up @@ -1169,6 +1170,10 @@ var _ = Describe("Starting CatalogSource e2e tests", Label("CatalogSource"), fun
}

for _, pod := range podList.Items {
// Ignore terminating pods
if pod.DeletionTimestamp != nil {
continue
}
ctx.Ctx().Logf("old image id %s\n new image id %s\n", registryPod.Items[0].Status.ContainerStatuses[0].ImageID,
pod.Status.ContainerStatuses[0].ImageID)
if pod.Status.ContainerStatuses[0].ImageID != registryPod.Items[0].Status.ContainerStatuses[0].ImageID {
Expand All @@ -1194,10 +1199,11 @@ var _ = Describe("Starting CatalogSource e2e tests", Label("CatalogSource"), fun
return false
}
By("await new catalog source and ensure old one was deleted")
// the required check for ensuring there's a non-terminating pod with the new image is covered in the podCheckFunc
registryPods, err = awaitPodsWithInterval(GinkgoT(), c, source.GetNamespace(), selector.String(), 30*time.Second, 10*time.Minute, podCheckFunc)
Expect(err).ShouldNot(HaveOccurred(), "error awaiting registry pod")
Expect(registryPods).ShouldNot(BeNil(), "nil registry pods")
Expect(registryPods.Items).To(HaveLen(1), "unexpected number of registry pods found")
Expect(registryPods.Items).ToNot(BeEmpty(), "no registry pods found")

By("update catalog source with annotation (to kick resync)")
Eventually(func() error {
Expand Down