Fix tests for CI by trdoyle81 · Pull Request #1108 · redhat-developer/gitops-operator

trdoyle81 · 2026-03-30T11:36:37Z

What type of PR is this?
/kind failing-test

What does this PR do / why we need it:
This PR fix two E2E test failures that happen when running v1.20 tests against OpenShift 4.21 in CI:

**Parallel Fix (1-050_validate_sso):**o skip the OIDC status check when a .ci version string is detected in the OpenShift version.
Sequential Fix (1-108_alternate_cluster_roles): Fix a race condition in the AfterEach cleanup block. The test was failing with a 404 NotFound error when trying to delete the test-gitops-ns namespace because it had already been deleted during the test execution. T

Have you updated the necessary documentation?

Documentation update is not required by this PR.

Which issue(s) this PR fixes:

Fixes #

Test acceptance criteria:

E2E Test

How to test changes / Special notes to the reviewer:

The parallel failure was explicitly caused by the test logic incorrectly parsing the server version 4.21.0-0.ci...
The sequential failure was a race condition. The 404 status error and Reason: "NotFound" for the test-gitops-ns namespace in the AfterEach stack trace.

Signed-off-by: Triona Doyle <bot@example.com>

varshab1210 · 2026-03-30T12:51:57Z

test/openshift/e2e/ginkgo/parallel/1-050_validate_sso_test.go

+
+			// also skip for CI
+			if strings.Contains(ocVersion, ".ci") {
+				Skip("skipping this test in CI because OIDC is not enabled by default")


@trdoyle81 if the test was succeeding on 4.21 while testing 1.20 RC I don't think it should be skipped in CI

auth operator on 4.21 seems to be way more picky about certificates than 4.20 was. So on any cluster that doesn't have genuine ingress certs the operator is staying stuck in progressing. I'm seeing this fail on standard 4.21 clusters too and not just in prow so I think we actually might need to skip this test for 4.21 entirely ?

Never mind, I didn't realise this test was modified. Can we add a check to skip in CI+ if its version is < 4.20?

Done. Updated to skip > 4.20. Also updated the AfterEach with null check because the namespace won't exist on skip.

...penshift/e2e/ginkgo/sequential/1-108_alternate_cluster_roles_cluster_scoped_instance_test.go

varshab1210 · 2026-03-30T13:40:45Z

/lgtm

Signed-off-by: Triona Doyle <bot@example.com>

test/openshift/e2e/ginkgo/parallel/1-050_validate_sso_test.go

Signed-off-by: Triona Doyle <bot@example.com>

varshab1210 · 2026-03-31T10:55:11Z

/lgtm
/approve

openshift-ci · 2026-03-31T10:55:18Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: varshab1210

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [varshab1210]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

trdoyle81 · 2026-03-31T11:41:03Z

/cherry-pick master

openshift-cherrypick-robot · 2026-03-31T11:41:13Z

@trdoyle81: only redhat-developer org members may request cherry picks. If you are already part of the org, make sure to change your membership to public. Otherwise you can still do the cherry-pick manually.

Details

In response to this:

/cherry-pick master

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

trdoyle81 · 2026-03-31T11:42:43Z

/cherry-pick master

openshift-cherrypick-robot · 2026-03-31T11:43:21Z

@trdoyle81: #1108 failed to apply on top of branch "master":

Applying: Fix tests for CI
Using index info to reconstruct a base tree...
M	test/openshift/e2e/ginkgo/parallel/1-050_validate_sso_test.go
M	test/openshift/e2e/ginkgo/sequential/1-108_alternate_cluster_roles_cluster_scoped_instance_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/openshift/e2e/ginkgo/sequential/1-108_alternate_cluster_roles_cluster_scoped_instance_test.go
CONFLICT (content): Merge conflict in test/openshift/e2e/ginkgo/sequential/1-108_alternate_cluster_roles_cluster_scoped_instance_test.go
Auto-merging test/openshift/e2e/ginkgo/parallel/1-050_validate_sso_test.go
CONFLICT (content): Merge conflict in test/openshift/e2e/ginkgo/parallel/1-050_validate_sso_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Fix tests for CI

Details

In response to this:

/cherry-pick master

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Fix tests for CI

2f69a04

Signed-off-by: Triona Doyle <bot@example.com>

openshift-ci bot added the kind/failing-test Categorizes issue or PR as related to a frequently failing test. label Mar 30, 2026

openshift-ci bot requested review from chetan-rns and jannfis March 30, 2026 11:36

trdoyle81 requested a review from varshab1210 March 30, 2026 11:49

varshab1210 reviewed Mar 30, 2026

View reviewed changes

openshift-ci bot assigned varshab1210 Mar 30, 2026

openshift-ci bot added the lgtm label Mar 30, 2026

add skip for 1-050 > 4.20

131fee6

Signed-off-by: Triona Doyle <bot@example.com>

openshift-ci bot removed the lgtm label Mar 30, 2026

Update the cleanup

9427a38

Signed-off-by: Triona Doyle <bot@example.com>

varshab1210 reviewed Mar 30, 2026

View reviewed changes

test/openshift/e2e/ginkgo/parallel/1-050_validate_sso_test.go Outdated Show resolved Hide resolved

test/openshift/e2e/ginkgo/parallel/1-050_validate_sso_test.go Outdated Show resolved Hide resolved

Revert 1-050 and fixture changes (to be resolved in separate PR)

3855b5e

Signed-off-by: Triona Doyle <bot@example.com>

openshift-ci bot added the lgtm label Mar 31, 2026

openshift-ci bot added the approved label Mar 31, 2026

openshift-merge-bot bot merged commit 74ae851 into redhat-developer:v1.20 Mar 31, 2026
5 checks passed

trdoyle81 mentioned this pull request Mar 31, 2026

Update 1-108_alternate_cluster_roles-test from v1.20 branch #1113

Merged

4 tasks

Conversation

trdoyle81 commented Mar 30, 2026

Uh oh!

varshab1210 Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

trdoyle81 Mar 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

varshab1210 Mar 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

trdoyle81 Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

varshab1210 commented Mar 30, 2026

Uh oh!

Uh oh!

Uh oh!

varshab1210 commented Mar 31, 2026

Uh oh!

openshift-ci bot commented Mar 31, 2026

Uh oh!

Uh oh!

trdoyle81 commented Mar 31, 2026

Uh oh!

openshift-cherrypick-robot commented Mar 31, 2026

Uh oh!

trdoyle81 commented Mar 31, 2026

Uh oh!

openshift-cherrypick-robot commented Mar 31, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

trdoyle81 Mar 30, 2026 •

edited

Loading

varshab1210 Mar 30, 2026 •

edited

Loading