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

ci: subiquity-check check stage-packages #827

Open
wants to merge 1 commit into
base: snap/ubuntu-desktop-bootstrap/main
Choose a base branch
from

Conversation

Chris-Peterson444
Copy link

I'd like to propose an additional check to the subiquity-check script to check for any stage-packages differences.
Is this the right branch to open the PR against? Or should it go against main?

I skip comparing the WSL specific packages because that's not something subiquity specifies and I'm not sure about the details on why those are under subiquitydeps in particular or if those still needs to be there.

Copy link
Member

@d-loose d-loose left a comment

Choose a reason for hiding this comment

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

Thanks a lot, this is really helpful!

I think the WSL specific dependencies can be safely removed now that the WSL OOBE has been deprecated (see internal spec WS030).

Do you want to make the necessary changes to the snapcraft.yaml in this PR, or should I do it separately?

Just to double-check, the changes would be:

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7a8174f97..9e0bf889a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -116,8 +116,6 @@ parts:
     stage-packages:
       # This list includes the dependencies for curtin and probert as well,
       # there doesn't seem to be any real benefit to listing them separately.
-      - cloud-init
-      - dctrl-tools
       - iso-codes
       - libpython3-stdlib
       - libpython3.10-minimal
@@ -147,9 +145,6 @@ parts:
       - python3.10-minimal
       - ssh-import-id
       - ubuntu-advantage-tools
-      # WSL specifics:
-      - language-selector-common
-      - locales
     prime:
       - -lib/systemd/system/*

@d-loose
Copy link
Member

d-loose commented Sep 19, 2024

P.S. is it worth adding this check to the snap/ubuntu-desktop-bootstrap/24.04 branch as well and clean up the stage-packages there too?

@Chris-Peterson444
Copy link
Author

I think the WSL specific dependencies can be safely removed now that the WSL OOBE has been deprecated (see internal spec WS030).

Thanks for the link! Yeah looks like that's a safe removal. I went ahead and rebased my changes to not expect a WSL portion to cut out since we're going to remove it.

Do you want to make the necessary changes to the snapcraft.yaml in this PR, or should I do it separately?

Either is fine. All of the changes look right to me too.

P.S. is it worth adding this check to the snap/ubuntu-desktop-bootstrap/24.04 branch as well and clean up the stage-packages there too?

Yeah I think so. I'll open another PR for that.

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