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

Ubuntu/jammy: fix dailies #5712

Merged
merged 3 commits into from
Sep 18, 2024

Conversation

TheRealFalcon
Copy link
Member

@TheRealFalcon TheRealFalcon commented Sep 17, 2024

@holmanb , do you mind reviewing this one? There were two conflicts based on some of your recent changes and I want to make sure I didn't mess them up.

I made an accidental bad push to upstream jammy, so it is currently at tip of main even though it was originally further back.

patches:
debian/patches/no-nocloud-network.patch
debian/patches/no-single-process.patch
debian/patches/revert-551f560d-cloud-config-after-snap-seeding.patch
@github-actions github-actions bot added the packaging Supplemental package review requested label Sep 17, 2024
subp.call_args_list,
)

- if backend == "lvm":
Copy link
Member Author

Choose a reason for hiding this comment

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

Is this right?

Copy link
Member

Choose a reason for hiding this comment

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

This is... confusing. The original test checks to make sure that the semaphore exists when waiting for snap. But on jammy, I'm not sure why we are still testing for this call. Am I missing something?

Copy link
Member Author

Choose a reason for hiding this comment

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

we were testing the dm-thin-pool.ko that was just removed, so I removed that as well.

Copy link
Member

Choose a reason for hiding this comment

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

we were testing the dm-thin-pool.ko that was just removed, so I removed that as well.

I know, I'm commenting on the remaining test. I don't think that it tests anything valuable, but I guess it doesn't hurt anything either.

{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
# Restart NetworkManager if it is present and running.
ExecStartPost=/bin/sh -c 'u=NetworkManager.service; \
TasksMax=infinity
Copy link
Member Author

Choose a reason for hiding this comment

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

Is this right?

Copy link
Member

Choose a reason for hiding this comment

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

Yes

@holmanb
Copy link
Member

holmanb commented Sep 17, 2024

It looks like I broke the GH Actions quilt job, here is a fix.

That test passes manually.

Copy link
Member

@holmanb holmanb left a comment

Choose a reason for hiding this comment

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

LGTM

@TheRealFalcon TheRealFalcon merged commit 7a45399 into canonical:ubuntu/jammy Sep 18, 2024
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
packaging Supplemental package review requested
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants