Skip to content

AppleHV: update LastUp time#21246

Merged
openshift-merge-bot[bot] merged 1 commit intocontainers:mainfrom
ashley-cui:lastupapplehv
Jan 12, 2024
Merged

AppleHV: update LastUp time#21246
openshift-merge-bot[bot] merged 1 commit intocontainers:mainfrom
ashley-cui:lastupapplehv

Conversation

@ashley-cui
Copy link
Copy Markdown
Member

@ashley-cui ashley-cui commented Jan 12, 2024

LastUp now correctly reports the lastUp time for podman machine on AppleHV, for both inspect and list.

[NO NEW TESTS NEEDED]
since this fixes an existing failing test.

Does this PR introduce a user-facing change?

Fixes: #21244
Related: #21245

Fixed a bug where the podman machine list and podman machine inspect commands would not show the correct Last Up time on AppleHV

@ashley-cui
AppleHV: update LastUp time
f374e07 
LastUp now correctly reports the lastUp time for podman machine on
AppleHV, for both inspect and list.

[NO NEW TESTS NEEDED]
since this fixes an existing failing test.

Signed-off-by: Ashley Cui <acui@redhat.com>
@openshift-ci openshift-ci bot added release-note do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jan 12, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Jan 12, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ashley-cui

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:

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 Jan 12, 2024
@ashley-cui ashley-cui marked this pull request as ready for review January 12, 2024 17:07
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 12, 2024
@packit-as-a-service
Copy link
Copy Markdown

packit-as-a-service bot commented Jan 12, 2024

Cockpit tests failed for commit f374e07. @martinpitt, @jelly, @mvollmer please check.

@jakecorrenti
Copy link
Copy Markdown
Member

jakecorrenti commented Jan 12, 2024 •
edited
Loading

LGTM will give this a test on my machine later, but that isn't a blocker

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 12, 2024
@jakecorrenti jakecorrenti removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 12, 2024
@rhatdan
Copy link
Copy Markdown
Member

rhatdan commented Jan 12, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 12, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 1783142 into containers:main Jan 12, 2024
@mheon
Copy link
Copy Markdown
Member

mheon commented Jan 30, 2024

/cherry-pick v4.9

@openshift-cherrypick-robot
Copy link
Copy Markdown
Collaborator

openshift-cherrypick-robot commented Jan 30, 2024

@mheon: #21246 failed to apply on top of branch "v4.9":

Applying: AppleHV: update LastUp time
Using index info to reconstruct a base tree...
M	pkg/machine/applehv/machine.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/machine/applehv/machine.go
CONFLICT (content): Merge conflict in pkg/machine/applehv/machine.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 AppleHV: update LastUp time
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".
Details

In response to this:

/cherry-pick v4.9

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.

@mheon
Copy link
Copy Markdown
Member

mheon commented Jan 30, 2024

Looks like it will need a manual backport

@edsantiago edsantiago mentioned this pull request Feb 8, 2024
Closed
@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 Apr 30, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 30, 2024
@ashley-cui ashley-cui deleted the lastupapplehv branch June 17, 2024 14:53
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

@rhatdan rhatdan

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. machine release-note

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

LastUp on AppleHV machines never updated

5 participants

@ashley-cui @jakecorrenti @rhatdan @mheon @openshift-cherrypick-robot