Revert "TRT-2869: Revert "NO-JIRA: Re-enable tests for the recommend cmd if alertsByCVO"" - #31462
Revert "TRT-2869: Revert "NO-JIRA: Re-enable tests for the recommend cmd if alertsByCVO""#31462hongkailiu wants to merge 2 commits into
Conversation
|
@hongkailiu: This pull request references TRT-2869 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 bug 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. |
|
Skipping CI for Draft Pull Request. |
|
Pipeline controller notification For optional jobs, comment This repository is configured in: automatic mode |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: hongkailiu 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 |
|
/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-1of3 periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-2of3 |
|
@hongkailiu: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/7464d050-8cd6-11f1-89bd-bf4e4b48806f-0 |
WalkthroughThe conditional recommendation tests now execute when CVO evaluates alerts. They use alternate listing output, require ChangesConditional recommendation test behavior
Estimated code review effort: 2 (Simple) | ~10 minutes Possibly related PRs
Caution Pre-merge checks failedPlease resolve all errors before merging. Addressing warnings is optional.
❌ Failed checks (1 error)
✅ Passed checks (14 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
It requires openshift/oc#2319 too. |
…cmd if alertsByCVO"" This reverts commit 3f7cc82.
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
test/extended/cli/adm_upgrade/recommend.go (1)
136-136: 🎯 Functional Correctness | 🟠 Major | ⚡ Quick winHandle a missing
FeatureGate/clusteras disabled.When
FeatureGate/clusteris absent,alertsEvaluatedByCVOmust return(false, nil). Propagate other errors.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@test/extended/cli/adm_upgrade/recommend.go` at line 136, Update alertsEvaluatedByCVO so a missing FeatureGate/cluster is treated as disabled and returns (false, nil), while propagating all other retrieval or parsing errors unchanged. Use the existing feature-gate lookup and error-handling path rather than altering unrelated version parsing.Source: Learnings
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Outside diff comments:
In `@test/extended/cli/adm_upgrade/recommend.go`:
- Line 136: Update alertsEvaluatedByCVO so a missing FeatureGate/cluster is
treated as disabled and returns (false, nil), while propagating all other
retrieval or parsing errors unchanged. Use the existing feature-gate lookup and
error-handling path rather than altering unrelated version parsing.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 398f236f-0241-4314-a02c-00c698689acb
📒 Files selected for processing (1)
test/extended/cli/adm_upgrade/recommend.go
|
/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-1of3 periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-2of3 periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-3of3 |
|
@hongkailiu: trigger 3 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/39c59860-8d5a-11f1-9cc2-c83496b50918-0 |
|
#31462 (comment) did not work. and $ oc adm release info --registry-config /tmp/t.d.json registry.ci.openshift.org/ocp-arm64/release-5-arm64:5.0.0-0.nightly-arm64-2026-08-01-030824 -o json | jq -r '.references.spec.tags[]|select(.name=="cli")|.annotations["io.openshift.build.commit.id"]'
0f340425c9edb4a546c66ce10cc37942b1561861Waiting for openshift/oc#2336 to get in nightly. |
|
/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-1of3 periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-2of3 periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-3of3 |
|
@hongkailiu: trigger 3 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/edda1010-8e13-11f1-9e31-9adf96895633-0 |
The error message was introduced by openshift/oc#2336.
|
/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-1of3 periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-2of3 periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-3of3 |
|
@hongkailiu: trigger 3 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/df6bdec0-8e5c-11f1-9126-b65c639a938f-0 |
|
/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-1of3 periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-2of3 periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-3of3 |
|
@hongkailiu: trigger 3 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/dbb1b390-8e75-11f1-8242-acccccc116f8-0 |
|
Scheduling required tests: |
|
@hongkailiu: The following tests 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. |
|
The jobs from this comment are green. It includes the job that was test in #31460 (comment) (and all shared jobs with serial + techpreview). /verified by @hongkailiu /hold cancel |
|
@hongkailiu: This PR has been marked as verified by 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. |
|
/retest-required |
|
/payload 5.0 nightly |
|
@hongkailiu: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info. |
|
/payload 5.0 nightly blocking |
|
@hongkailiu: trigger 14 job(s) of type blocking for the nightly release of OCP 5.0
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c48b22b0-8eba-11f1-8a3b-b6a99aad5403-0 |
|
/test e2e-gcp-ovn |
The pull reverts #31460 + an error message adjustment for openshift/oc#2336 which fixed the error which was expected to see in #31440 but failed.
Summary by CodeRabbit