Skip to content

OCPCLOUD-2992: add machineset migration e2e utils#323

Merged
openshift-merge-bot[bot] merged 2 commits intoopenshift:mainfrom
sunzhaohua2:util
Jul 3, 2025
Merged

OCPCLOUD-2992: add machineset migration e2e utils#323
openshift-merge-bot[bot] merged 2 commits intoopenshift:mainfrom
sunzhaohua2:util

Conversation

@sunzhaohua2
Copy link
Copy Markdown
Contributor

@sunzhaohua2 sunzhaohua2 commented Jun 24, 2025

No description provided.

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

openshift-ci-robot commented Jun 24, 2025 •
edited by openshift-ci Bot
Loading

@sunzhaohua2: This pull request references OCPCLOUD-2992 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 "4.20.0" version, but no target version was set.

Details

In 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.

@openshift-ci openshift-ci Bot requested review from RadekManak and sub-mod June 24, 2025 01:33
@sunzhaohua2 sunzhaohua2 mentioned this pull request Jun 24, 2025
Closed
@shellyyang1989
Copy link
Copy Markdown

shellyyang1989 commented Jun 24, 2025

@theobarberbany @damdo I'd appreciate it if you could take a look. Thanks.

@damdo
Copy link
Copy Markdown
Member

damdo commented Jun 24, 2025

/assign @theobarberbany

@damdo
Copy link
Copy Markdown
Member

damdo commented Jun 24, 2025

/test unit

theobarberbany
theobarberbany reviewed Jun 24, 2025
View reviewed changes
Comment thread e2e/go.mod
damdo
damdo reviewed Jun 24, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

@sunzhaohua2 Looks very good, left mostly comments about adding retry to make the suite more robust to brief failures, and some notes on error wrapping messages

Thanks!

Comment thread e2e/framework/machine.go Outdated
Comment thread e2e/framework/machine.go Outdated
Comment thread e2e/framework/machine.go Outdated
Comment thread e2e/framework/machineset.go Outdated
Comment thread e2e/framework/machine.go Outdated
Comment thread e2e/framework/machinetemplate.go
Comment thread e2e/framework/machinetemplate.go Outdated
Comment thread e2e/framework/machinetemplate.go Outdated
Comment thread e2e/framework/util.go Outdated
Comment thread e2e/framework/util.go Outdated
theobarberbany
theobarberbany reviewed Jun 24, 2025
View reviewed changes
Comment thread e2e/framework/machine.go Outdated
theobarberbany
theobarberbany reviewed Jun 24, 2025
View reviewed changes
Comment thread e2e/framework/machineset.go Outdated
theobarberbany
theobarberbany reviewed Jun 24, 2025
View reviewed changes
Comment thread e2e/framework/machine.go Outdated
theobarberbany
theobarberbany reviewed Jun 24, 2025
View reviewed changes
Comment thread e2e/framework/machine.go Outdated
theobarberbany
theobarberbany reviewed Jun 24, 2025
View reviewed changes
Comment thread e2e/framework/machineset.go Outdated
JoelSpeed
JoelSpeed reviewed Jun 24, 2025
View reviewed changes
Comment thread e2e/framework/machine.go Outdated
Comment thread e2e/framework/machine.go Outdated
Comment thread e2e/framework/machine.go Outdated
Comment thread e2e/framework/machineset.go Outdated
Comment thread e2e/framework/machinetemplate.go Outdated
Comment thread e2e/framework/machinetemplate.go Outdated
Comment thread e2e/framework/machinetemplate.go Outdated
Comment thread e2e/framework/util.go Outdated
@sunzhaohua2 sunzhaohua2 force-pushed the util branch 2 times, most recently from 7e9bcfa to 4d168c0 Compare June 26, 2025 05:43
damdo
damdo reviewed Jun 26, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

Hey @sunzhaohua2 thanks a lot for implementing the changes!
I left a couple of minor comments but this looks good!

Comment thread e2e/framework/machine.go Outdated
Comment thread e2e/framework/util.go
@sunzhaohua2
Copy link
Copy Markdown
Contributor Author

sunzhaohua2 commented Jun 27, 2025

@damdo @JoelSpeed @theobarberbany thanks for helping review 👍 I have updated according to our comments, please help to take a look again, thanks!

damdo
damdo reviewed Jul 1, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

I am happy with the changes, thanks @sunzhaohua2

/approve

Will leave the LGTM to @theobarberbany and @JoelSpeed
/hold

@openshift-ci openshift-ci Bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 1, 2025
JoelSpeed
JoelSpeed reviewed Jul 1, 2025
View reviewed changes
Comment thread e2e/framework/machine.go Outdated
Comment thread e2e/framework/machineset.go Outdated
Comment thread e2e/framework/machinetemplate.go Outdated
@JoelSpeed
Copy link
Copy Markdown
Contributor

JoelSpeed commented Jul 2, 2025

Units failed, but code changes LGTM

@sunzhaohua2
Copy link
Copy Markdown
Contributor Author

sunzhaohua2 commented Jul 3, 2025

/retest

@damdo
Copy link
Copy Markdown
Member

damdo commented Jul 3, 2025

Units now passing PTAL @JoelSpeed

@theobarberbany
Copy link
Copy Markdown
Contributor

theobarberbany commented Jul 3, 2025

/lgtm
/approve

Nice one! :)

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 3, 2025
@theobarberbany
Copy link
Copy Markdown
Contributor

theobarberbany commented Jul 3, 2025

/hold

for one last look in case anyone wants to

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 3, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo, theobarberbany

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:
  • OWNERS [damdo,theobarberbany]

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

@JoelSpeed
Copy link
Copy Markdown
Contributor

JoelSpeed commented Jul 3, 2025

/hold cancel

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 3, 2025
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 3, 2025

/retest-required

Remaining retests: 0 against base HEAD d3c592d and 2 for PR HEAD ecdefa4 in total

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 3, 2025

@sunzhaohua2: The following tests 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/regression-clusterinfra-cucushift-rehearse-capi-aws-ipi ecdefa4 link false /test regression-clusterinfra-cucushift-rehearse-capi-aws-ipi
ci/prow/okd-scos-e2e-aws-ovn ecdefa4 link false /test okd-scos-e2e-aws-ovn
ci/prow/regression-clusterinfra-aws-ipi-techpreview-capi ecdefa4 link false /test regression-clusterinfra-aws-ipi-techpreview-capi

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.

@openshift-merge-bot openshift-merge-bot Bot merged commit 12b6e45 into openshift:main Jul 3, 2025
23 of 25 checks passed
@openshift-bot
Copy link
Copy Markdown

openshift-bot commented Jul 3, 2025

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-capi-operator
This PR has been included in build ose-cluster-capi-operator-container-v4.20.0-202507031344.p0.g12b6e45.assembly.stream.el9.
All builds following this will include this PR.

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

Reviewers

@damdo damdo damdo left review comments

@JoelSpeed JoelSpeed JoelSpeed left review comments

@RadekManak RadekManak Awaiting requested review from RadekManak

@sub-mod sub-mod Awaiting requested review from sub-mod

+1 more reviewer

@theobarberbany theobarberbany theobarberbany left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@theobarberbany theobarberbany

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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@sunzhaohua2 @openshift-ci-robot @shellyyang1989 @damdo @JoelSpeed @theobarberbany @openshift-bot