Skip to content

OPRUN-4574: UPSTREAM: <carry>: Disable upstream TLSProfile tests#702

Open
tmshort wants to merge 1 commit intoopenshift:mainfrom
tmshort:disable-tls-upstream-tls-tests
Open

OPRUN-4574: UPSTREAM: <carry>: Disable upstream TLSProfile tests#702
tmshort wants to merge 1 commit intoopenshift:mainfrom
tmshort:disable-tls-upstream-tls-tests

Conversation

@tmshort
Copy link
Copy Markdown
Contributor

@tmshort tmshort commented Apr 18, 2026

This should allow downstream sync to succeed.

Summary by CodeRabbit

  • Chores
    • Updated end-to-end test configuration to use environment variables for test filtering instead of hardcoded values, improving flexibility in test execution and enabling easier configuration of test tag filters.

Signed-off-by: Todd Short <todd.short@me.com>
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Apr 18, 2026

@tmshort: This pull request references OPRUN-4574 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

Details

In response to this:

This should allow downstream sync to succeed.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 18, 2026
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 18, 2026

Walkthrough

The test-e2e target in the Makefile is refactored to source godog tag filters from an exported environment variable instead of using hardcoded values. The new variable adds ~@TLSProfile exclusion alongside the existing ~@mirrored-registry exclusion. A variable naming inconsistency is present between definition and usage.

Changes

Cohort / File(s) Summary
Makefile Configuration
openshift/Makefile
Introduced exported variable for godog flags with mirrored-registry and TLSProfile exclusions. Updated test-e2e target to reference this variable. Note: Variable defined as DOWNSTREAL_GODOG_FLAGS but referenced as DOWNSTREAM_GODOG_FLAGS—potential typo requiring verification.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

🚥 Pre-merge checks | ✅ 10
✅ Passed checks (10 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly indicates the primary change: disabling upstream TLSProfile tests in the context of a Makefile modification that adds tag filtering.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Stable And Deterministic Test Names ✅ Passed PR modifies only openshift/Makefile godog flags; no Ginkgo test names added or modified, so custom check passes.
Test Structure And Quality ✅ Passed The custom check for Ginkgo test code quality is not applicable to this PR as only the openshift/Makefile was modified, not actual test code files.
Microshift Test Compatibility ✅ Passed This pull request does not add any new Ginkgo e2e tests. The PR only modifies the openshift/Makefile to change how existing tests are filtered by updating godog tags flags to exclude tests with the @TLSProfile tag. Since the custom check assesses MicroShift compatibility of newly added e2e tests, and this PR contains no new test additions, the check is not applicable and therefore passes.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR modifies only Makefile test exclusion flags; no new Ginkgo e2e tests are added, so SNO compatibility check does not apply.
Topology-Aware Scheduling Compatibility ✅ Passed This check is not applicable to the provided pull request. The custom check specifically applies to changes in deployment manifests, operator code, or controllers that introduce scheduling constraints (anti-affinity, topology spread, node selectors, replica counts, etc.). The PR only modifies openshift/Makefile to adjust test execution flags via godog tag filtering—this is purely test infrastructure configuration that does not affect runtime pod scheduling, deployment specifications, or controller behavior on any OpenShift topology (SNO, Two-Node, HyperShift, etc.).
Ote Binary Stdout Contract ✅ Passed PR only modifies openshift/Makefile test configuration; no code changes affecting stdout contract.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No new Ginkgo e2e tests are added in this PR; only openshift/Makefile is modified to exclude existing TLSProfile tests.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 18, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tmshort

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 18, 2026
Copy link
Copy Markdown

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@openshift/Makefile`:
- Around line 44-50: The exported variable name DOWNSTREAL_GODOG_FLAGS in the
Makefile is misspelled and does not match the variable used in the test-e2e
target (DOWNSTREAM_GODOG_FLAGS); fix the typo by renaming the export to
DOWNSTREAM_GODOG_FLAGS so the exported value (including the ~@TLSProfile
exclusion) is used when invoking go test
--godog.tags="$(DOWNSTREAM_GODOG_FLAGS)". Update the export line rather than the
usage in test-e2e to preserve intent.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 8d1ebb0d-3e1a-4293-8b4a-be9cc66b6b90

📥 Commits

Reviewing files that changed from the base of the PR and between 30ae9b2 and b8027e7.

📒 Files selected for processing (1)
  • openshift/Makefile

Comment thread openshift/Makefile
Comment on lines +44 to +50
export DOWNSTREAL_GODOG_FLAGS := ~@mirrored-registry && ~@TLSProfile
.PHONY: test-e2e
test-e2e: ## Run the e2e tests.
$(DIR)/operator-controller/build-test-registry.sh $(E2E_REGISTRY_NAMESPACE) $(E2E_REGISTRY_NAME) $(E2E_REGISTRY_IMAGE)
cd $(DIR)/../; \
LOCAL_REGISTRY_HOST=$$(oc get route $(E2E_REGISTRY_NAME) -n $(E2E_REGISTRY_NAMESPACE) -o jsonpath='{.spec.host}') \
go test $(DOWNSTREAM_E2E_FLAGS) ./test/e2e/features_test.go --godog.tags="~@mirrored-registry" --k8s.cli=oc
go test $(DOWNSTREAM_E2E_FLAGS) ./test/e2e/features_test.go --godog.tags="$(DOWNSTREAM_GODOG_FLAGS)" --k8s.cli=oc
Copy link
Copy Markdown

@coderabbitai coderabbitai bot Apr 18, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical

Fix the godog flags variable name mismatch.

Line 44 exports DOWNSTREAL_GODOG_FLAGS, but Line 50 consumes DOWNSTREAM_GODOG_FLAGS. As written, the --godog.tags argument will expand from the wrong variable, so the new ~@TLSProfile exclusion never takes effect.

Suggested fix
-export DOWNSTREAL_GODOG_FLAGS := ~@mirrored-registry && ~@TLSProfile
+export DOWNSTREAM_GODOG_FLAGS := ~@mirrored-registry && ~@TLSProfile
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
export DOWNSTREAL_GODOG_FLAGS := ~@mirrored-registry && ~@TLSProfile
.PHONY: test-e2e
test-e2e: ## Run the e2e tests.
$(DIR)/operator-controller/build-test-registry.sh $(E2E_REGISTRY_NAMESPACE) $(E2E_REGISTRY_NAME) $(E2E_REGISTRY_IMAGE)
cd $(DIR)/../; \
LOCAL_REGISTRY_HOST=$$(oc get route $(E2E_REGISTRY_NAME) -n $(E2E_REGISTRY_NAMESPACE) -o jsonpath='{.spec.host}') \
go test $(DOWNSTREAM_E2E_FLAGS) ./test/e2e/features_test.go --godog.tags="~@mirrored-registry" --k8s.cli=oc
go test $(DOWNSTREAM_E2E_FLAGS) ./test/e2e/features_test.go --godog.tags="$(DOWNSTREAM_GODOG_FLAGS)" --k8s.cli=oc
export DOWNSTREAM_GODOG_FLAGS := ~@mirrored-registry && ~@TLSProfile
.PHONY: test-e2e
test-e2e: ## Run the e2e tests.
$(DIR)/operator-controller/build-test-registry.sh $(E2E_REGISTRY_NAMESPACE) $(E2E_REGISTRY_NAME) $(E2E_REGISTRY_IMAGE)
cd $(DIR)/../; \
LOCAL_REGISTRY_HOST=$$(oc get route $(E2E_REGISTRY_NAME) -n $(E2E_REGISTRY_NAMESPACE) -o jsonpath='{.spec.host}') \
go test $(DOWNSTREAM_E2E_FLAGS) ./test/e2e/features_test.go --godog.tags="$(DOWNSTREAM_GODOG_FLAGS)" --k8s.cli=oc
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@openshift/Makefile` around lines 44 - 50, The exported variable name
DOWNSTREAL_GODOG_FLAGS in the Makefile is misspelled and does not match the
variable used in the test-e2e target (DOWNSTREAM_GODOG_FLAGS); fix the typo by
renaming the export to DOWNSTREAM_GODOG_FLAGS so the exported value (including
the ~@TLSProfile exclusion) is used when invoking go test
--godog.tags="$(DOWNSTREAM_GODOG_FLAGS)". Update the export line rather than the
usage in test-e2e to preserve intent.

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.

Should we not addreess?

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

@camilamacedo86, yes, this must be addressed — it's a critical bug that defeats the entire purpose of the PR.

Here's what happens without the fix:

  1. The exported variable is DOWNSTREAL_GODOG_FLAGS (typo: REAL instead of REAM)
  2. But the go test command references $(DOWNSTREAM_GODOG_FLAGS) (the correct spelling)
  3. Since those names don't match, $(DOWNSTREAM_GODOG_FLAGS) expands to an empty string in Make
  4. The actual invocation becomes --godog.tags="", so ~@TLSProfile is never applied
  5. TLSProfile tests continue to run — exactly what this PR is trying to prevent

The fix is a one-character correction on the export line:

-export DOWNSTREAL_GODOG_FLAGS := ~@mirrored-registry && ~@TLSProfile
+export DOWNSTREAM_GODOG_FLAGS := ~@mirrored-registry && ~@TLSProfile

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 18, 2026

@tmshort: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/openshift-e2e-aws b8027e7 link true /test openshift-e2e-aws

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants