tests/nested/manual: fix muinstaller-real#16447
Merged
ernestl merged 1 commit intocanonical:masterfrom Jan 23, 2026
Merged
Conversation
|
Fri Jan 23 13:51:01 UTC 2026 Failures:Preparing:
Executing:
Restoring:
|
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #16447 +/- ##
========================================
Coverage 77.50% 77.50%
========================================
Files 1346 1348 +2
Lines 184273 184732 +459
Branches 2444 2444
========================================
+ Hits 142821 143185 +364
- Misses 32811 32880 +69
- Partials 8641 8667 +26
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
ernestl
force-pushed
the
ernestl/fix-muinstaller-real-26.04
branch
from
b6c1a81 to
a3956af
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes the muinstaller-real test to work properly with Ubuntu 26.04. The changes enable testing on Ubuntu 26 systems and address various compatibility issues discovered during testing.
Changes:
- Enable Ubuntu 26.04 support in muinstaller tests
- Replace
ip_tablesmodule checks withahcifor better cross-version compatibility - Add Ubuntu 26.04-specific base image handling
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| tests/nested/manual/muinstaller-real/task.yaml | Adds Ubuntu 26 to supported systems and changes module check from ip_tables to ahci |
| tests/nested/manual/build-with-kernel-modules-components/task.yaml | Updates module checks from ip_tables to ahci for consistency |
| tests/lib/tools/setup_nested_hybrid_system.sh | Adds SNAPPY_TESTING environment variable and improves kpartx error handling |
| tests/lib/tools/build_kernel_with_comps.sh | Handles multiple module paths using array syntax |
| tests/lib/muinstaller/mk-classic-rootfs.sh | Adds Ubuntu 26.04 snapshot support and mounts /proc for systemd.postinst |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
bboozzoo
reviewed
Jan 19, 2026
ernestl
force-pushed
the
ernestl/fix-muinstaller-real-26.04
branch
5 times, most recently
from
7aa0515 to
748e8e3
Compare
ernestl
added
the
Auto rerun spread
ernestl
force-pushed
the
ernestl/fix-muinstaller-real-26.04
branch
from
748e8e3 to
8458c2d
Compare
andrewphelpsj
approved these changes
Jan 22, 2026
| cp "$module_path" "$comp_ko_dir" | ||
| mapfile -t module_path <<< "$module_path" | ||
| cp --update=none "${module_path[@]}" "$comp_ko_dir" | ||
| snap pack --filename="${kernel_name}+${comp_name}".comp "$comp_name" |
Member
There was a problem hiding this comment.
Maybe slightly simpler?
diff --git a/tests/lib/tools/build_kernel_with_comps.sh b/tests/lib/tools/build_kernel_with_comps.sh
index 99c13b4d19..7eabdf90ea 100755
--- a/tests/lib/tools/build_kernel_with_comps.sh
+++ b/tests/lib/tools/build_kernel_with_comps.sh
@@ -39,15 +39,19 @@ description: kernel component for testing purposes
EOF
# Replace _ or - with [_-], as it can be any of these
glob_mod_name=$(printf '%s' "$mod_name" | sed -r 's/[-_]/[-_]/g')
- module_path=$(find kernel -name "${glob_mod_name}.ko*")
+ # TODO: search only in kernel/modules to avoid duplicates (pc-kernel in
+ # 26/edge has both modules/ and lib/modules/). remove this hack once
+ # the kernel snap is fixed
+ module_path=$(find kernel/modules -name "${glob_mod_name}.ko*")
cp "$module_path" "$comp_ko_dir"
snap pack --filename="${kernel_name}+${comp_name}".comp "$comp_name"
# Create kernel without the kernel module
rm "$module_path"
- # depmod wants a lib subdir
- mkdir -p kernel/lib
- ln -s ../modules kernel/lib/modules
+ if [ ! -e kernel/lib/modules ]; then
+ mkdir -p kernel/lib
+ ln -s ../modules kernel/lib/modules
+ fi
depmod -b kernel/ "$kern_ver"
rm "${kernel_snap_file}"
# append component meta-information
Member
Author
|
failure openstack-ext:ubuntu-20.04-64:tests/nested/manual/preseed fixed elsewhere: #16485 |
ernestl
changed the title
ernestl
added a commit
to ernestl/snapd
that referenced
this pull request
Feb 2, 2026
Merged
ernestl
added a commit
that referenced
this pull request
Feb 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix muinstaller-real.
Note: the failure for variant
:seededis due to an actual core26 bug, it will be fixed here: canonical/core-base#393