Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CheckExclusiveArch should use local JSON too #21009

Merged
merged 1 commit into from
Dec 14, 2023

Conversation

baude
Copy link
Member

@baude baude commented Dec 13, 2023

When performing CheckExclusiveArch, we should get a list of VMs that exist on disk (JSON). We should then iterate those and checking if they are running in HyperV.

[NO NEW TESTS NEEDED]

Does this PR introduce a user-facing change?

None

Copy link
Contributor

openshift-ci bot commented Dec 13, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: baude

The full list of commands accepted by this bot can be found here.

The pull request process is described here

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 Dec 13, 2023
When performing CheckExclusiveArch, we should get a list of VMs that
exist on disk (JSON).  We should then iterate those and checking if they
are running in HyperV.

[NO NEW TESTS NEEDED]

Signed-off-by: Brent Baude <[email protected]>
@baude baude force-pushed the hypervcheckexclusivearch branch from 4df99b1 to 3a84202 Compare December 13, 2023 20:41
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM

}
// hyperv does not know about it, move on
if !exists { // hot path
// TODO should we logrus this to show we found a JSON with no hyperv vm ?
Copy link
Member

Choose a reason for hiding this comment

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

properly ok to not log this here. I think for something like machine ls it should be logged as error but if I start one machine I don't think there is a point in erroring about another machine config problem.

@mheon
Copy link
Member

mheon commented Dec 14, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 14, 2023
@openshift-merge-bot openshift-merge-bot bot merged commit 9c16f1b into containers:main Dec 14, 2023
91 of 92 checks passed
@baude
Copy link
Member Author

baude commented Dec 14, 2023

/cherry-pick v4.8

@openshift-cherrypick-robot
Copy link
Collaborator

@baude: #21009 failed to apply on top of branch "v4.8":

Applying: CheckExclusiveArch should use local JSON too
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	pkg/machine/hyperv/config.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging pkg/machine/hyperv/config.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 CheckExclusiveArch should use local JSON too
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick v4.8

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/test-infra repository.

@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Mar 14, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants