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

podman: experiment with "fallback to normal bootstrap" #1200

Conversation

praiskup
Copy link
Member

Needs to be applied on top of #1199, if at all.

@praiskup praiskup marked this pull request as draft August 28, 2023 20:40
Copy link
Member

@xsuchy xsuchy left a comment

Choose a reason for hiding this comment

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

+1

@praiskup praiskup force-pushed the praiskup-fallback-bootstrap-image branch 5 times, most recently from cb74219 to d6f9dc4 Compare August 29, 2023 08:55
@praiskup praiskup marked this pull request as ready for review August 29, 2023 08:56
@praiskup praiskup force-pushed the praiskup-fallback-bootstrap-image branch 4 times, most recently from 7839ed8 to e1ad979 Compare August 29, 2023 09:19
@praiskup
Copy link
Member Author

@xsuchy can you please re-review? I've also added retry-mechanism.

@praiskup praiskup requested a review from xsuchy August 29, 2023 09:21
@praiskup praiskup force-pushed the praiskup-fallback-bootstrap-image branch from e1ad979 to 757b8ad Compare August 29, 2023 09:37
try:
yield
except BootstrapError as exc:
if not self.config["image_fallback"]:
Copy link
Member

Choose a reason for hiding this comment

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

image_fallback or bootstrap_image_fallback?

Copy link
Member

Choose a reason for hiding this comment

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

Ahh, in bootstrap it is without the prefix. Ignore my comment.

Copy link
Member

@xsuchy xsuchy left a comment

Choose a reason for hiding this comment

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

+1

@praiskup praiskup force-pushed the praiskup-fallback-bootstrap-image branch from 757b8ad to d19c01c Compare August 29, 2023 11:34
@praiskup
Copy link
Member Author

Thank you for taking a look!

praiskup added a commit to praiskup/mock that referenced this pull request Aug 29, 2023
When Podman isn't installed, or the image can not be downloaded, or the
image isn't compatible with host arch - Mock newly falls-back to a
normal 'dnf --installroot' when bootstrap_image_fallback=True (default).

Closes: rpm-software-management#1200
praiskup added a commit to praiskup/mock that referenced this pull request Aug 29, 2023
Move podman_check_native_image_architecture() to the later stage, so we
don't retry upon architecture mismatch.

Relates: containers/podman#19770
Closes: rpm-software-management#1200
@praiskup praiskup force-pushed the praiskup-fallback-bootstrap-image branch from d19c01c to ee8f26f Compare August 29, 2023 20:14
@praiskup
Copy link
Member Author

rebased

When Podman isn't installed, or the image can not be downloaded, or the
image isn't compatible with host arch - Mock newly falls-back to a
normal 'dnf --installroot' when bootstrap_image_fallback=True (default).

Closes: rpm-software-management#1200
Move podman_check_native_image_architecture() to the later stage, so we
don't retry upon architecture mismatch.

Relates: containers/podman#19770
Closes: rpm-software-management#1200
This message may be raised when /bin/podman fails for any reason, not
just when that image arch != host arch.
@praiskup praiskup force-pushed the praiskup-fallback-bootstrap-image branch from ee8f26f to a056d52 Compare August 29, 2023 20:49
@praiskup
Copy link
Member Author

praiskup commented Aug 29, 2023

Sorry for yet another rebase, I believe the code is now a bit clearer.

@praiskup praiskup merged commit 49c9cb6 into rpm-software-management:main Aug 30, 2023
praiskup added a commit that referenced this pull request Aug 30, 2023
When Podman isn't installed, or the image can not be downloaded, or the
image isn't compatible with host arch - Mock newly falls-back to a
normal 'dnf --installroot' when bootstrap_image_fallback=True (default).

Closes: #1200
praiskup added a commit that referenced this pull request Aug 30, 2023
Move podman_check_native_image_architecture() to the later stage, so we
don't retry upon architecture mismatch.

Relates: containers/podman#19770
Closes: #1200
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants