OPRUN-4574: UPSTREAM: <carry>: Disable upstream TLSProfile tests#702
OPRUN-4574: UPSTREAM: <carry>: Disable upstream TLSProfile tests#702tmshort wants to merge 1 commit intoopenshift:mainfrom
Conversation
Signed-off-by: Todd Short <todd.short@me.com>
|
@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. DetailsIn response to this:
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. |
WalkthroughThe Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~8 minutes 🚥 Pre-merge checks | ✅ 10✅ Passed checks (10 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
[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 DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
There was a problem hiding this comment.
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
📒 Files selected for processing (1)
openshift/Makefile
| 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 |
There was a problem hiding this comment.
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.
| 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.
There was a problem hiding this comment.
Should we not addreess?
There was a problem hiding this comment.
@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:
- The exported variable is
DOWNSTREAL_GODOG_FLAGS(typo:REALinstead ofREAM) - But the
go testcommand references$(DOWNSTREAM_GODOG_FLAGS)(the correct spelling) - Since those names don't match,
$(DOWNSTREAM_GODOG_FLAGS)expands to an empty string in Make - The actual invocation becomes
--godog.tags="", so~@TLSProfileis never applied - 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|
@tmshort: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
This should allow downstream sync to succeed.
Summary by CodeRabbit