tests: several fixes to nested tests for UC24 #14761

Meulengracht · 2024-11-26T09:46:13Z

Rough summary of changes for some of the nested tests:

Make sure we write the bootstrap wrapper for core24
Repack gadget with core24 as a base for hybrid-remodel in core24 scenario
Switch back to 24-hwe, there is no such thing as 24-oem
Fix how we add and check for section in kernel.efi

The remodel-min-size still needs to be fixed, will do that in a separate PR
The core20-early-config also needs its own PR (#14771)

REF: SNAPDENG-33308

codecov · 2024-11-26T10:23:52Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 79.03%. Comparing base (96ea7b0) to head (b3ed2ab).
Report is 121 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master   #14761      +/-   ##
==========================================
+ Coverage   78.95%   79.03%   +0.07%     
==========================================
  Files        1084     1087       +3     
  Lines      146638   147941    +1303     
==========================================
+ Hits       115773   116919    +1146     
- Misses      23667    23778     +111     
- Partials     7198     7244      +46

Flag	Coverage Δ
unittests	`79.03% <ø> (+0.07%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

…dget with core24 as a base for hybrid 24, fix how we add and check for section in kernel.efi

…nel is the same version between 24-hwe and 24. for now use beta to stable

Meulengracht · 2024-11-27T14:56:58Z

tests/lib/assertions/classic-model-rev1-24.assert

@@ -17,7 +17,7 @@ snaps:
    name: pc
    type: gadget
  -
-    default-channel: 24-oem/stable


no oem track

tests/lib/assertions/classic-model-rev1-24.json

…ness to encounter same revision for UC24

zyga

I don't know core parts well enough to approve. Just two random observations.

zyga · 2024-11-28T09:21:12Z

tests/nested/manual/hybrid-remodel/task.yaml

-  snap download --basename=pc-kernel --channel="$VERSION/stable" pc-kernel
+
+  # download beta to increase the unlikeliness that we encounter the
+  # same revision when remodelling. 


So this can still randomly fail. What kind of option do we have for this to be fully robust regardless of releases?

Idk, I was hoping someone might have a better idea - maybe repacking it and installing as an unasserted kernel would be fine.

@alfonsosanchezbeato idea?

Why do not we repack the kernel here?

Note that we will have to rewrite this test in the FDE branch. Because we will have to repack everything and remodel from the fakestore. So maybe we do not need to do the effort twice.

tests/nested/manual/hybrid-remodel/task.yaml

ernestl

Looks good thanks

ernestl · 2024-11-28T09:19:45Z

tests/lib/prepare.sh

@@ -775,6 +775,39 @@ uc20_build_corrupt_kernel_snap() {
    rm -rf "$REPACKED_DIR"
 }

+uc_write_bootstrap_wrapper() {


valentindavid · 2024-11-29T08:52:27Z

tests/lib/prepare.sh

+beforeDate="$(date --utc '+%s')"
+/usr/lib/snapd/snap-bootstrap.real "$@"
+if [ -d /run/mnt/data/system-data ]; then
+    touch /run/mnt/data/system-data/the-tool-ran


I think we should clean that up. On 22+, it is not called the-tool anymore. And since we have systemd re-execution in 22+ we can actually ask systemd directly if and when it was run.

And of course, in a follow up PR

valentindavid · 2024-11-29T08:54:27Z

tests/lib/prepare.sh

+    touch /run/mnt/data/system-data/the-tool-ran
+fi
+# also copy the time for the clock-epoch to system-data, this is
+# used by a specific test but doesn't hurt anything to do this for


It would be nice to find out which "specific test" needs it and add it in the comment. I really wonder if that is still needed.

valentindavid · 2024-11-29T08:56:22Z

tests/lib/prepare.sh

+    local SKELETON_PATH="$1"
+    local INJECT_ERR="${2:-false}"
+
+    cp -a /usr/lib/snapd/snap-bootstrap "$SKELETON_PATH"/usr/lib/snapd/snap-bootstrap.real


I feel a lot of it should have been done by dropping a configuration for ExecStartPre and ExecStartPost. Maybe some clean up for the future.

valentindavid

Thank you.

Nice that you extracted uc_write_bootstrap_wrapper. We should really look at rewriting it now.

* tests: make sure we write the bootstrap wrapper for core24, repack gadget with core24 as a base for hybrid 24, fix how we add and check for section in kernel.efi * t/nested/manual/hybrid-remodel: update core base in snap.yaml as well * t/nested/manual/hybrid-remodel: so no reboot is happening because kernel is the same version between 24-hwe and 24. for now use beta to stable * t/nested/manual/hybrid-remodel: undo the channel switch * t/nested/manual/hybrid-remodel: use beta channel to increase unlikeliness to encounter same revision for UC24 * t/nested/manual/hybrid-remodel: fix the track check

Meulengracht added the Run nested The PR also runs tests inluded in nested suite label Nov 26, 2024

Meulengracht requested review from sergiocazzolato, alfonsosanchezbeato and valentindavid November 26, 2024 09:59

Meulengracht marked this pull request as ready for review November 26, 2024 10:01

Meulengracht closed this Nov 26, 2024

Meulengracht reopened this Nov 26, 2024

tests: make sure we write the bootstrap wrapper for core24, repack ga…

284c0fc

…dget with core24 as a base for hybrid 24, fix how we add and check for section in kernel.efi

Meulengracht force-pushed the bugfix/core24-nested-fixes branch from ce3232b to 284c0fc Compare November 27, 2024 08:21

Meulengracht added 2 commits November 27, 2024 15:32

t/nested/manual/hybrid-remodel: update core base in snap.yaml as well

583d55d

t/nested/manual/hybrid-remodel: so no reboot is happening because ker…

bf0be06

…nel is the same version between 24-hwe and 24. for now use beta to stable

Meulengracht commented Nov 27, 2024

View reviewed changes

t/nested/manual/hybrid-remodel: undo the channel switch

5e156ff

Meulengracht force-pushed the bugfix/core24-nested-fixes branch from e4261d4 to 5e156ff Compare November 27, 2024 15:00

sergiocazzolato reviewed Nov 27, 2024

View reviewed changes

tests/lib/assertions/classic-model-rev1-24.json Show resolved Hide resolved

t/nested/manual/hybrid-remodel: use beta channel to increase unlikeli…

0a55c9e

…ness to encounter same revision for UC24

zyga reviewed Nov 28, 2024

View reviewed changes

ernestl approved these changes Nov 28, 2024

View reviewed changes

ernestl added this to the 2.67 milestone Nov 28, 2024

ernestl mentioned this pull request Nov 28, 2024

release: 2.67 #14767

Merged

t/nested/manual/hybrid-remodel: fix the track check

b3ed2ab

valentindavid reviewed Nov 29, 2024

View reviewed changes

valentindavid approved these changes Nov 29, 2024

View reviewed changes

ernestl merged commit 82c1dfc into canonical:master Nov 29, 2024
47 of 56 checks passed

ernestl added the cherry-picked label Nov 29, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

tests: several fixes to nested tests for UC24 #14761

tests: several fixes to nested tests for UC24 #14761

Meulengracht commented Nov 26, 2024 •

edited

Loading

codecov bot commented Nov 26, 2024 •

edited

Loading

Meulengracht Nov 27, 2024 •

edited

Loading

zyga left a comment

zyga Nov 28, 2024

Meulengracht Nov 28, 2024 •

edited

Loading

valentindavid Nov 29, 2024

valentindavid Nov 29, 2024

ernestl left a comment

ernestl Nov 28, 2024

valentindavid Nov 29, 2024

valentindavid Nov 29, 2024

valentindavid Nov 29, 2024

valentindavid Nov 29, 2024

valentindavid left a comment

tests: several fixes to nested tests for UC24 #14761

tests: several fixes to nested tests for UC24 #14761

Conversation

Meulengracht commented Nov 26, 2024 • edited Loading

codecov bot commented Nov 26, 2024 • edited Loading

Codecov Report

Meulengracht Nov 27, 2024 • edited Loading

Choose a reason for hiding this comment

zyga left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Meulengracht Nov 28, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ernestl left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

valentindavid left a comment

Choose a reason for hiding this comment

Meulengracht commented Nov 26, 2024 •

edited

Loading

codecov bot commented Nov 26, 2024 •

edited

Loading

Meulengracht Nov 27, 2024 •

edited

Loading

Meulengracht Nov 28, 2024 •

edited

Loading