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

tests: fixes uc24 nested tests - part 3 #14114

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions tests/lib/assertions/test-snapd-remodel-pc-min-size-24.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"type": "model",
"series": "16",
"authority-id": "test-snapd",
"brand-id": "test-snapd",
"store": "CQvkdMjgbapk821Po2cF",
"model": "test-snapd-remodel-pc-min-size",
"system-user-authority": "*",
"architecture": "amd64",
"timestamp": "2024-04-14T10:05:00+00:00",
"grade": "dangerous",
"base": "core24",
"snaps": [
{
"default-channel": "latest/edge",
"id": "hZwlp9iRUQE4nLHRXnavvDygTIpfOOwj",
"name": "test-snapd-remodel-pc-snakeoil",
"type": "gadget"
},
{
"default-channel": "24/stable",
"id": "pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza",
"name": "pc-kernel",
"type": "kernel"
},
{
"default-channel": "latest/stable",
"id": "dwTAh7MZZ01zyriOZErqd1JynQLiOGvM",
"name": "core24",
"type": "base"
},
{
"default-channel": "latest/stable",
"id": "PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4",
"name": "snapd",
"type": "snapd"
}
]
}
44 changes: 44 additions & 0 deletions tests/lib/assertions/test-snapd-remodel-pc-min-size-24.model
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
type: model
authority-id: test-snapd
series: 16
brand-id: test-snapd
model: test-snapd-remodel-pc-min-size
architecture: amd64
base: core24
grade: dangerous
snaps:
-
default-channel: latest/edge
id: hZwlp9iRUQE4nLHRXnavvDygTIpfOOwj
name: test-snapd-remodel-pc-snakeoil
type: gadget
-
default-channel: 24/stable
id: pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza
name: pc-kernel
type: kernel
-
default-channel: latest/stable
id: dwTAh7MZZ01zyriOZErqd1JynQLiOGvM
name: core24
type: base
-
default-channel: latest/stable
id: PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4
name: snapd
type: snapd
store: CQvkdMjgbapk821Po2cF
system-user-authority: *
timestamp: 2024-04-14T10:05:00+00:00
sign-key-sha3-384: z5UoZNBNRc6KXRIg96L6tZ723_CDbUu45bRC-wcINgigB2S9GGGe6DWJqlzI6p0S

AcLBcwQAAQoAHRYhBJwYfdLgNpH0AbmOCVr7utGyRTi5BQJmdiPIAAoJEFr7utGyRTi5GCcP/0iJ
5eFjIDbSmAMFuXAiWd2/iZsz4+Wy2C2E2+ld60zQYOJ/7TxYfyDsuk8yvRXyFpSdq7Pfy620/841
hDXwfERGfTvEbxUH6SDHnVCgxArNQHP9kJNuolmDjhq9gBgISpQOtDLfd+Eknl1wx+GSyGFTTM5B
PxIQCyurf267v7MLMgfww+CNtWfdv/5Gb6mcnql+7rr6OB8co1YobYVCiRnTbefnmtwkgGapgDk/
k0sD5SOaVTkw49H/B+77RHoNHAMjekTjZApy842PLI5yuq+R5zZaCOql1l0hPZSnpBMGjJouFNgs
Ex4FkaVG4eO7C3Ogt5WUOEDBpJ6YQXxksjDDKI8BErO7Dp+J0Wyg65duJbnLNtPt/LNygwi+8MT3
j1YpPrY5utHgVeVdveysxmaX1mZDQu0wfdJo0ByWn+ibn3PdZCL0PJwnWtBvDFEM8pNJzUKGMNul
j61W5hpM49pTWM04jSoPOBVvaSfNpNPRg+qrIQa0Zz/WhVXwe6ibzJby9LBWyEgIk6f3yKm96YWx
vNxfmU2r590XvjZwua38CQUCWcGkNd767ekXuw6fUfD0u3h6EEzh8NqM32sVRZfXZPWkV9o9UPjc
3cX2VBT2es7p8Y8tZCPVCdBIpJvwDNILBcJC2Qm7w1IkowfCTL3/W7V6HYBSJPiRe8U8785Q
39 changes: 39 additions & 0 deletions tests/lib/assertions/test-snapd-remodel-pc-rev0-24.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"type": "model",
"series": "16",
"authority-id": "test-snapd",
"brand-id": "test-snapd",
"store": "CQvkdMjgbapk821Po2cF",
"model": "test-snapd-remodel-pc",
"system-user-authority": "*",
"architecture": "amd64",
"timestamp": "2024-05-14T10:05:00+00:00",
"grade": "dangerous",
"base": "core24",
"snaps": [
{
"default-channel": "24/stable",
"id": "bfwFXAeMCr9x5jt0WYhCe3rT5ueri0oE",
"name": "test-snapd-remodel-pc",
"type": "gadget"
},
{
"default-channel": "24/stable",
"id": "pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza",
"name": "pc-kernel",
"type": "kernel"
},
{
"default-channel": "latest/stable",
"id": "dwTAh7MZZ01zyriOZErqd1JynQLiOGvM",
"name": "core24",
"type": "base"
},
{
"default-channel": "latest/stable",
"id": "PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4",
"name": "snapd",
"type": "snapd"
}
]
}
44 changes: 44 additions & 0 deletions tests/lib/assertions/test-snapd-remodel-pc-rev0-24.model
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
type: model
authority-id: test-snapd
series: 16
brand-id: test-snapd
model: test-snapd-remodel-pc
architecture: amd64
base: core24
grade: dangerous
snaps:
-
default-channel: 24/stable
id: bfwFXAeMCr9x5jt0WYhCe3rT5ueri0oE
name: test-snapd-remodel-pc
type: gadget
-
default-channel: 24/stable
id: pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza
name: pc-kernel
type: kernel
-
default-channel: latest/stable
id: dwTAh7MZZ01zyriOZErqd1JynQLiOGvM
name: core24
type: base
-
default-channel: latest/stable
id: PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4
name: snapd
type: snapd
store: CQvkdMjgbapk821Po2cF
system-user-authority: *
timestamp: 2024-05-14T10:05:00+00:00
sign-key-sha3-384: z5UoZNBNRc6KXRIg96L6tZ723_CDbUu45bRC-wcINgigB2S9GGGe6DWJqlzI6p0S

AcLBcwQAAQoAHRYhBJwYfdLgNpH0AbmOCVr7utGyRTi5BQJmdiPMAAoJEFr7utGyRTi5xF8P/jwm
0Ms53dWQ8EGc4KXDIhPD3IEbRfGe5c4IbK+t/XVwM96TU8W8i/Z3AUDBlIZUEmfiWwLSUktdB/In
B4Pyfi64xeQNYicqCMOaal8G2wjzYzzCbQx7MT+ryXkFc4LolFJYI9elsOCSMQN9mStDFl11Zd75
yacI9NC64YIjx3KSrxll7tud34izTMksWoO0QrL31l5YHpmUpjx/UdU2U8XqPAu3NZzthZEKNZTN
WzMVe53/MD41sK/oom/Ly4Hii46YvnHx2FqObPZqA+sUAQOQZyzlEisDWOSB3RZx0uR9b8YK3eXb
h4IbAQcEPC4N9jIc4a9aM0pqaBvY8SgXI3RSSh5Sdmr4mp16oJ/8wwoviXpPa2Pmn0J4TChj8EBZ
woJW2eNsJjgVOz4vW7zFgXc38sTQb4UMWKMeV8yVsJjc5VDTik9svkT8qnbYQhYm7ZBYqamAMaFp
eVfZhsRpafzTRWztqJGbpe1GsCS5CalUFuOo+Wbc44S3g0CaKYWSzMix06e1Z5fCN4UHMfiwNe+0
nH0eZfuYLGbUxPhChebrLqhhommQtlIoBTd4eUVVDCoEEnPYzeLtvtpS33qUnJJ9yDgLBytxWwaQ
cL5SfWKboXmsara3t0KsptNJxGXgfndeCJJnNLvQDMlcCK6/ptagiVTfSR45CBoFmFQvHndB
40 changes: 40 additions & 0 deletions tests/lib/assertions/test-snapd-remodel-pc-rev1-24.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"type": "model",
"series": "16",
"authority-id": "test-snapd",
"brand-id": "test-snapd",
"store": "CQvkdMjgbapk821Po2cF",
"model": "test-snapd-remodel-pc",
"system-user-authority": "*",
"architecture": "amd64",
"timestamp": "2024-05-14T10:05:00+00:00",
"grade": "dangerous",
"base": "core24",
"revision": "1",
"snaps": [
{
"default-channel": "latest/edge",
"id": "tTs9DVS01mt4L11PGqbrSiKcIxFHpUJq",
"name": "test-snapd-remodel-pc-min-size",
"type": "gadget"
},
{
"default-channel": "24/stable",
"id": "pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza",
"name": "pc-kernel",
"type": "kernel"
},
{
"default-channel": "latest/stable",
"id": "dwTAh7MZZ01zyriOZErqd1JynQLiOGvM",
"name": "core24",
"type": "base"
},
{
"default-channel": "latest/stable",
"id": "PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4",
"name": "snapd",
"type": "snapd"
}
]
}
45 changes: 45 additions & 0 deletions tests/lib/assertions/test-snapd-remodel-pc-rev1-24.model
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
type: model
authority-id: test-snapd
revision: 1
series: 16
brand-id: test-snapd
model: test-snapd-remodel-pc
architecture: amd64
base: core24
grade: dangerous
snaps:
-
default-channel: latest/edge
id: tTs9DVS01mt4L11PGqbrSiKcIxFHpUJq
name: test-snapd-remodel-pc-min-size
type: gadget
-
default-channel: 24/stable
id: pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza
name: pc-kernel
type: kernel
-
default-channel: latest/stable
id: dwTAh7MZZ01zyriOZErqd1JynQLiOGvM
name: core24
type: base
-
default-channel: latest/stable
id: PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4
name: snapd
type: snapd
store: CQvkdMjgbapk821Po2cF
system-user-authority: *
timestamp: 2024-05-14T10:05:00+00:00
sign-key-sha3-384: z5UoZNBNRc6KXRIg96L6tZ723_CDbUu45bRC-wcINgigB2S9GGGe6DWJqlzI6p0S

AcLBcwQAAQoAHRYhBJwYfdLgNpH0AbmOCVr7utGyRTi5BQJmdiPAAAoJEFr7utGyRTi5XigP/RW3
NTnl9m4eog5DQMGptUEKrxhTqibFf7MMRI2GYJ10zPv+es/tTPjrxz6WTeYmBw/OoEwM2i72mPcK
J0xzBMYS2VgWds4d8uMI8ENTPVjso1JwrHvy7vorYlrkjurAJJ25Wlc3NFoIaZpeo9EpShuQyALR
47egAtjV5pMVbdfwSC07UkeL4OjtiwVe+snJ0WafAyp6A0K110ilvKmahhwhcOZs9d3hHjo5ir0S
l+yAZQ9CvmDDtwP5RPWw/gtnqTQAUziDgZEFbn+II7yNyhJIei1Ua4zqVcGxjGXWWEXzmD641td4
fcMh96wfFWdK5YTTVCPPPConYeaa5S+RbQqn9NNyjKSZL5FLW5IapGT4iz/Dt9YEQfYME8POT3Ph
XRL2HsisGOxLWnBqh7Lm9aQ4heca67Hrjhno6e3/PpMn/cbgtBipEFY3+3EmtrLRc3xkfqUWvREs
J4M0utRg9DI9NzhH1vDuSjAIfQh+xjML4T/gH7nL1iu3rl4G26vUzl5kpBMG49HbqEHO12vzUgRN
zYluUK/iTe2tYOszJiwpW3bGVAaHxh+wY9UfhtQ90bvMzoslQQRS/wgiDH0uADfkiV89VyN+RvLx
m2tgpc8OrvM4xid2QF1LeT4rVi+1somBM3jEmeoJ9yD/Q1JEOv1Qfa4etucmaJpm+cWsqDkh
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"type": "model",
"authority-id": "test-snapd",
"series": "16",
"brand-id": "test-snapd",
"model": "my-model",
"revision": "2",
"architecture": "amd64",
"timestamp": "2024-04-20T22:08:34+00:00",
"grade": "dangerous",
"base": "core24",
"serial-authority": ["generic"],
"validation-sets": [
{
"name": "test-snapd-pinned-hello-world",
"mode": "enforce"
}
],
"snaps": [
{
"default-channel": "24/stable",
"id": "UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH",
"name": "pc",
"type": "gadget"
},
{
"default-channel": "24/stable",
"id": "pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza",
"name": "pc-kernel",
"type": "kernel"
},
{
"default-channel": "latest/stable",
"id": "dwTAh7MZZ01zyriOZErqd1JynQLiOGvM",
"name": "core24",
"type": "base"
},
{
"default-channel": "latest/stable",
"id": "PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4",
"name": "snapd",
"type": "snapd"
},
{
"default-channel": "latest/stable",
"id": "99T7MUlRhtI3U0QFgl5mXXESAiSwt776",
"name": "core",
"type": "core"
},
{
"default-channel": "latest/stable",
"id": "buPKUD3TKqCOgLEjjHx5kSiCpIs5cMuQ",
"name": "hello-world",
"type": "app"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
type: model
authority-id: test-snapd
revision: 2
series: 16
brand-id: test-snapd
model: my-model
architecture: amd64
base: core24
grade: dangerous
serial-authority:
- generic
snaps:
-
default-channel: 24/stable
id: UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH
name: pc
type: gadget
-
default-channel: 24/stable
id: pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza
name: pc-kernel
type: kernel
-
default-channel: latest/stable
id: dwTAh7MZZ01zyriOZErqd1JynQLiOGvM
name: core24
type: base
-
default-channel: latest/stable
id: PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4
name: snapd
type: snapd
-
default-channel: latest/stable
id: 99T7MUlRhtI3U0QFgl5mXXESAiSwt776
name: core
type: core
-
default-channel: latest/stable
id: buPKUD3TKqCOgLEjjHx5kSiCpIs5cMuQ
name: hello-world
type: app
timestamp: 2024-04-20T22:08:34+00:00
validation-sets:
-
mode: enforce
name: test-snapd-pinned-hello-world
sign-key-sha3-384: 7qWG-Uwck6Dji43a3Z8ZZrm7rAziZAch3xf76iFvqe4GaD0LI7U9lYPWMSJAsEgu

AcLBcwQAAQoAHRYhBGESvKlz1RXG1IBOC0MdJKf2hr9ABQJmddnmAAoJEEMdJKf2hr9Au/gP/2ll
0lScNP9zH/ZOL/VXx1tt758vor19i5IU9uQIsjVyqKWnPocPag72wDkBie9GgQXUC6QLZOKo817X
XpP8/OEppdcV+8F/2Dln0E+dwpK7XGhTvGsdJnQxQ2EiWSOA2XcSLE9CL4XqYdE7sApx4vjmCBQJ
Gmf9eXBpUfwbtkVu1l7JnwK/RmI/nff7uHT4VMUyhRED7BTkgwXh9cguqVKzDIAVsbsBmbBE9L2H
saO4UVYjbpviqKXNV7W0zeLQZ8siYSdS3vExG8hnt8m744a6njVQeJSpADLQo8nIvJq8yZD2iVKG
lVPdlnqgv2LSHoidbOcMyzqBaoJX2AQgWSqvfqvaT7tRsDgUoayMowUWAYzyXeGA8DP4crhxhHFb
lbxV6yiadoSOdDlVB8jaUWzK5z9U7Kw/gvrslL5VlnHf3wrkk1KbHYUjhOGR+Tdeo+2XXHnr86ee
w5TEHCSkVVLOSduGXyuO7TXViHnHl9gcsgMcsY3vl/NguQh+tWsGNOEEMOpjYjF5jSW+5oZs9CWa
9//ACMPHqnykRD/Trr1dU9bi48DN/NcEPMa245I58eBMCNHCSJiB9oUq0CF0mq1kQHzli9YWKe2W
k/Wh+KRazMR8cBwLSt4WxzrHfDeqjjGEmbcmJGPFhs9J2ofCJ1XS/cTJgKmUTSExvXugwuyZ
Loading
Loading