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

kernel plugin: change location where snapd deb is unpacked #4200

Merged
merged 3 commits into from
Jun 6, 2023

Conversation

kubiko
Copy link
Contributor

@kubiko kubiko commented Jun 5, 2023

ubnutu-core-initramfs tool changed where snap-boostrap is fetched from. It assumes snap-bootstrap from passed --root to be used. Unpack the downloaded snapd debian package to the same directory where "ubnutu-core-initramfs" debian package is unpacked. This directory is already passed to the ubnutu-core-initramfs tool as --root

@kubiko kubiko changed the base branch from main to hotfix/7.4 June 6, 2023 12:51
Copy link
Collaborator

@mr-cal mr-cal left a comment

Choose a reason for hiding this comment

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

The changes look good. Can you fix the unit tests?

`ubnutu-core-initramfs` tool changed where `snap-boostrap` is fetched from.
It assumes `snap-bootstrap` from passed `--root` to be used.
Unpack the downloaded snapd debian package to the same directory where
"ubnutu-core-initramfs" debian package is unpacked.
This directory is already passed to the `ubnutu-core-initramfs` tool as `--root`

Signed-off-by: Ondrej Kubik <ondrej.kubik@canonical.com>
@kubiko
Copy link
Contributor Author

kubiko commented Jun 6, 2023

@mr-cal unit test fixed and rebased against hotfix/7.4

@codecov-commenter
Copy link

codecov-commenter commented Jun 6, 2023

Codecov Report

Merging #4200 (f1a5a3e) into hotfix/7.4 (df79292) will not change coverage.
The diff coverage is n/a.

❗ Current head f1a5a3e differs from pull request most recent head 1d13b6d. Consider uploading reports for the commit 1d13b6d to get more accurate results

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

@@             Coverage Diff             @@
##           hotfix/7.4    #4200   +/-   ##
===========================================
  Coverage       94.85%   94.85%           
===========================================
  Files             648      648           
  Lines           54353    54353           
===========================================
  Hits            51554    51554           
  Misses           2799     2799           
Impacted Files Coverage Δ
snapcraft/parts/plugins/kernel.py 100.00% <ø> (ø)
snapcraft_legacy/plugins/v2/_kernel_build.py 98.14% <ø> (ø)
snapcraft_legacy/plugins/v2/kernel.py 95.74% <ø> (ø)
tests/legacy/unit/plugins/v2/test_kernel.py 98.51% <ø> (ø)
tests/unit/parts/plugins/test_kernel.py 98.57% <ø> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@mr-cal mr-cal merged commit c0e7fd9 into canonical:hotfix/7.4 Jun 6, 2023
13 checks passed
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.

None yet

3 participants