Update openshift/api verify scripts to tolerate existing replace statements#81726
Update openshift/api verify scripts to tolerate existing replace statements#81726JoelSpeed wants to merge 1 commit into
Conversation
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: JoelSpeed 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 |
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited) Review profile: CHILL Plan: Enterprise Run ID: 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
WalkthroughThe OpenShift API CI configuration replaces appended ChangesCI module replacement updates
Estimated code review effort: 2 (Simple) | ~5 minutes 🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
/testwith openshift/api/master/verify-client-go openshift/client-go#368 |
|
/testwith openshift/api/master/verify-client-go openshift/client-go#368 openshift/api#2813 |
4aff98c to
e5326c2
Compare
|
[REHEARSALNOTIFIER]
Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
/testwith openshift/api/master/verify-client-go openshift/client-go#368 openshift/api#2813 |
|
/pj-rehearse ack I don't think this is rehearseable, but I've tested the go mod edits locally and I'm fairly happy this should help |
|
@JoelSpeed: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/test yamllint |
|
@JoelSpeed: all tests passed! 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. |
When pre-merge testing with
/testwithwe end up with multiple replace statements trying to prove that the various staged PRs will play nicely together. I think this should improve the situation and allow us to properly replace the go.mod statements even if they were previously replaced in another PR in the chainSummary by CodeRabbit
openshift/apimaster verification configuration (ci-operator/config/openshift/api/openshift-api-master.yaml) so theverify-client-goandverify-hypershift-integrationjobs safely set localreplacedirectives for/testwithruns.replace ... => ...lines togo.mod, the jobs now usego mod editto remove any existing localreplaceentries for the relevant modules (github.com/openshift/apiand, for hypershift integration,github.com/openshift/client-go) and then apply the intended local replacements./testwithtesting work correctly when multiple staged pull requests already introducedreplacestatements ingo.mod, avoiding conflicts between replacements.