Skip to content

Workarounds for OLM e2e tests - #310

Open
mclasmeier wants to merge 2 commits into
mainfrom
mc/e2e-olm-workaround
Open

mclasmeier wants to merge 2 commits into
mainfrom
mc/e2e-olm-workaround

Conversation

@mclasmeier

@mclasmeier mclasmeier commented Oct 14, 2026 •

Copy link
Copy Markdown
Collaborator

Please merge!

Works around a pre-existing issue in OLM tests caused by roxies current handling of on-cluster manifests, persisting configuration values and poisining redeployments.

Summary by CodeRabbit

  • Tests
    • Deployment-switch test coverage now explicitly specifies whether OLM is enabled for non-OLM deployments and transitions between deployment modes. This makes the configurations being validated more explicit. No end-user functionality changes are included.

@mclasmeier
mclasmeier requested a review from porridge October 14, 2026 10:39
@coderabbitai

coderabbitai Bot commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration
  • Configuration used: Repository: stackrox/roxie/.coderabbit.yml
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: ea4bd458-6c35-4365-a168-26ca9ecdf523
📥 Commits

Reviewing files that changed from the base of the PR and between 1773975 and 4c8c69b.

📒 Files selected for processing: 1
  • tests/e2e/olm_switch_test.go

Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.

📝 Walkthrough

The OLM switch tests now explicitly pass --olm=false for non-OLM deployments. The secured-cluster test places the flag before the deployment target.

Changes: OLM switch tests

Layer / File(s) Summary
Set OLM flags in deployment tests
tests/e2e/olm_switch_test.go
The OLM-to-non-OLM redeployment and the initial non-OLM deployment now explicitly pass --olm=false. The secured-cluster test moves the flag before the deployment target. Comments describe the explicit OLM setting.

Priority: ⬇️ Low

Estimated code review effort: 1 (Trivial) | ~4 minutes

Change: Other

Merge Risk: ⚪ Minimal · up to 020a7

Merge Risk: ⚪ Minimal · up to 020a7

The OLM switch tests explicitly select non-OLM deployments, including when configuration persists across redeployments. No merge-blocking issue is identified.

Pre-merge checks: Passed 5
Passed Passed checks: 5 passed
Check name Status Explanation
Docstring Coverage Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 3 functions across 1 files.
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Description Check Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check Passed The title clearly identifies the main change: workarounds for OLM end-to-end tests.
✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR

Comment @coderabbitai help to get the list of available commands.

@mclasmeier mclasmeier added the olm-tests If set, spawn an OpenShift cluster and run OLM tests against it. label Oct 14, 2026

@porridge porridge left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something is still wrong.

2026-10-14T12:30:00.7323413Z     olm_switch_test.go:179: Verifying initial OLM operator deployment
2026-10-14T12:30:01.1145730Z     olm_switch_test.go:180: ✓ Operator is deployed in expected mode (OLM: true)
2026-10-14T12:30:01.9043865Z     olm_switch_test.go:181: ✓ Operator deployed and ready in namespace rhacs-operator-system (1 replicas)
2026-10-14T12:30:02.2831936Z     olm_switch_test.go:184: 
2026-10-14T12:30:02.2832642Z         	Error Trace:	/__w/roxie/roxie/tests/e2e/helpers.go:487
2026-10-14T12:30:02.2833338Z         	            				/__w/roxie/roxie/tests/e2e/olm_switch_test.go:184
2026-10-14T12:30:02.2833935Z         	Error:      	Not equal: 
2026-10-14T12:30:02.2834467Z         	            	expected: "quay.io/rhacs-eng/main:4.11.4"
2026-10-14T12:30:02.2834858Z         	            	actual  : ""
2026-10-14T12:30:02.2835186Z         	            	
2026-10-14T12:30:02.2835523Z         	            	Diff:
2026-10-14T12:30:02.2835869Z         	            	--- Expected
2026-10-14T12:30:02.2836205Z         	            	+++ Actual
2026-10-14T12:30:02.2836523Z         	            	@@ -1 +1 @@
2026-10-14T12:30:02.2836877Z         	            	-quay.io/rhacs-eng/main:4.11.4
2026-10-14T12:30:02.2837891Z         	            	+
2026-10-14T12:30:02.2838308Z         	Test:       	TestOLMOperatorVersionUpgrade
2026-10-14T12:30:02.2838870Z         	Messages:   	Operator deployment env var RELATED_IMAGE_MAIN mismatch in rhacs-operator-system
2026-10-14T12:30:02.2839852Z     olm_switch_test.go:184: ✓ Operator deployment in rhacs-operator-system has RELATED_IMAGE_MAIN=""

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

olm-tests If set, spawn an OpenShift cluster and run OLM tests against it.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants