forked from canonical/snapd
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tests: first set of changes to make nested tests run (canonical#13889)
* First list of changes to make nested tests run * avoid using OVMF with 4M * Check for cloud init status in uc24 * removed OVMF_SIZE var which is not used anymore * fix merge issue * update gadget.yaml for test-snapd-remove-pc-24 snap * remove mbr and source: shim.efi.signed from gadget.yaml * restoring source: shim.efi.signed in seed partition * Fixed the incorrect uuid of the core24 snap * fixed the snapcraft.yaml for jq-core24
- Loading branch information
1 parent
4c95f27
commit 7d480d7
Showing
44 changed files
with
1,161 additions
and
21 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
type: account | ||
authority-id: testrootorg | ||
account-id: developer1 | ||
display-name: Developer1 | ||
timestamp: 2020-09-11T11:43:46-05:00 | ||
username: developer1 | ||
validation: unproven | ||
sign-key-sha3-384: hIedp1AvrWlcDI4uS_qjoFLzjKl5enu4G2FYJpgB3Pj-tUzGlTQBxMBsBmi-tnJR | ||
|
||
AcLBUgQAAQoABgUCX1upQgAAa6sQALM/XTz+4h0t9G/eHTrPYCVCztPugC9ZyTLtqRgdvv2JIl4p | ||
oBK7/bByBE8K6Qhp8koAcXQ/PVzjMFrW1bs2g6BODPvoy9g0DKMgDZRxMXT7F9Uv006qBWED0D2g | ||
utsUeYYpCBDOAV843rvwaXYDtTvNQngTaQQ2EGO6XODtGUkRVyjFS3KG+EfbRVtf9gx6VvkrbBLR | ||
FSAtd22uKmfD35FUZuUHFszZ/mRZ0OwF40V74vl1EXTWnRxuqzSH47FiWfOYYYcODPDLzPRxyP6T | ||
vKqoRQ4vPr+GhrmtLoTInuC9KAoLF2CHto9NUAoPX79/RF967Utv9URpmKZsBQItdWnx83bmLVYc | ||
soA3wLS74W/VHfYNFJi1F6Nw2yKewVfyVfq/Cd2IcFO0B/+Rk05+1H3d0JWKj4nDSSVgIN7DdhBQ | ||
5iIxhEZb5G9taLMFE8xfMS1+Ss5MMoMs/VPoojlJhJimNmgcatj58ygQNaX07pJ+mcMYT6XAQ9gx | ||
9SwNOoDXqf6lf6khtJk1zBQwLCc0Yslb7f/CwCDBVht1ycwyZvnLMDw2Ohlj/tQ9KSJAVflqCFDm | ||
ccH4uhHFMgD8SNRASS10LU2GIH+8Rqw5wkj6VXEkoMIHERAqnwR7/9ByCHLiDs1QUTL7ncRWuEq5 | ||
eYCJRESnQP9guEFOoUmOO+gkDpCo | ||
|
||
type: account-key | ||
authority-id: testrootorg | ||
public-key-sha3-384: EAD4DbLxK_kn0gzNCXOs3kd6DeMU3f-L6BEsSEuJGBqCORR0gXkdDxMbOm11mRFu | ||
account-id: developer1 | ||
name: default | ||
since: 2020-09-11T11:47:45-05:00 | ||
body-length: 717 | ||
sign-key-sha3-384: hIedp1AvrWlcDI4uS_qjoFLzjKl5enu4G2FYJpgB3Pj-tUzGlTQBxMBsBmi-tnJR | ||
|
||
AcbBTQRWhcGAARAAtJGIguK7FhSyRxL/6jvdy0zAgGCjC1xVNFzeF76p5G8BXNEEHZUHK+z8Gr2J | ||
inVrpvhJhllf5Ob2dIMH2YQbC9jE1kjbzvuauQGDqk6tNQm0i3KDeHCSPgVN+PFXPwKIiLrh66Po | ||
AC7OfR1rFUgCqu0jch0H6Nue0ynvEPiY4dPeXq7mCdpDr5QIAM41L+3hg0OdzvO8HMIGZQpdF6jP | ||
7fkkVMROYvHUOJ8kknpKE7FiaNNpH7jK1qNxOYhLeiioX0LYrdmTvdTWHrSKZc82ZmlDjpKc4hUx | ||
VtTXMAysw7CzIdREPom/vJklnKLvZt+Wk5AEF5V5YKnuT3pY+fjVMZ56GtTEeO/Er/oLk/n2xUK5 | ||
fD5DAyW/9z0ygzwTbY5IuWXyDfYneL4nXwWOEgg37Z4+8mTH+ftTz2dl1x1KIlIR2xo0kxf9t8K+ | ||
jlr13vwF1+QReMCSUycUsZ2Eep5XhjI+LG7G1bMSGqodZTIOXLkIy6+3iJ8Z/feIHlJ0ELBDyFbl | ||
Yy04Sf9LI148vJMsYenonkoWejWdMi8iCUTeaZydHJEUBU/RbNFLjCWa6NIUe9bfZgLiOOZkps54 | ||
+/AL078ri/tGjo/5UGvezSmwrEoWJyqrJt2M69N2oVDLJcHeo2bUYPtFC2Kfb2je58JrJ+llifdg | ||
rAsxbnHXiXyVimUAEQEAAQ== | ||
|
||
AcLBUgQAAQoABgUCX1uqMQAAZZ0QACLpYbT+5zRcluR6I4IPyGrVgTM19L7x4rxlOIU5wdRdM6xi | ||
Dnl49fj7XaC8hNNsZ+lKe8VvjZU44gMFtvooBY6nsub5wiaG3PwR4Oed9J4p6Xv5DrrFTLUy62sV | ||
/ApfcQwcTgZPt9PHAvr4nWKrl0ierxfIdgdPBV5w+mEOPHSCx/JyX8b6BhDHgH07NEGvFWj0by9I | ||
g1VCmxNceH+a0loYizU1S3LJnBGD89W0UMq1HRO8stBIH5VC4VeaOppnj8MnnVUriF90lK26YzGR | ||
fFZsg/f5S4CC0lHCh+6jvIAjOFinmCg8ouI5ja2c54nWQ/D1ZHjNqvEC8fVNWf3VYYZUIrKDMdCz | ||
WNvtfk44bBp9mHKIPiS3Sn5xNK8pwZ/ldmAiLMZSovIYzocHqeIUAos7M8lth1lLrGo29Iwv6lof | ||
tfpJT8QKkrKU63tCOuvw6W1pmfU/LU91cEuq4dVE+77GpDiOo66LsSHZzLMQb+fkjOnK79swJ6Bw | ||
AqHJYdx/mNU1/N9FeUbzgESjSY6OydjWhAB6F/T5S8O/K8SExF2+wQIOw+A+D80QbrpbcsL5Yzcb | ||
gqS5rFAxK1vPvMUk/t7pXpcoR9t+KGqsNhMiG0AsFqckZi0A2F5XzUztF2MtDLUdNaxmEC7ZITB/ | ||
tgWXS3ChGQqx9v3dl0VqKP/Pkad/ | ||
|
||
type: system-user | ||
authority-id: developer1 | ||
brand-id: developer1 | ||
email: [email protected] | ||
models: | ||
- testkeys-snapd-signed-core-24-amd64 | ||
- testkeys-snapd-secured-core-24-amd64 | ||
name: user1 | ||
password: $6$o5er943Y$cngsJHutSgACVbR65WAnhaUPC9.vENj8locb50hvMdMRMK8cQ3Zbu6WPh5Al2JrnHzpR63osPCwE/IFG/2s6K1 | ||
series: | ||
- 16 | ||
since: 2024-04-09T01:00:00+00:00 | ||
until: 2064-05-16T18:06:04+00:00 | ||
username: user1 | ||
sign-key-sha3-384: EAD4DbLxK_kn0gzNCXOs3kd6DeMU3f-L6BEsSEuJGBqCORR0gXkdDxMbOm11mRFu | ||
|
||
AcLBUgQAAQoABgUCZhWbpwAAPz8QAH40mhDPKDDo/M0C5iuxGg+ceRnMse3fhuArv9kv5RsYnBoS | ||
ZFzboluii9Li1i+77WMvPBkGVWKCzcqKUKhl8VEiGwoMHF6xEi5xRH0Tq5MtBbir4PKlu88gkomL | ||
HZ+Ekgzxr0/C15dLnz+uGMUFqnyjLGnRGvQ9kxegwK57bVMEjkIeaUE1dCf0eiIsd2c5/BVeRfnC | ||
U9Sujc73GZsnhFSk07Rjf7pz8BICrtiJGftgsMabCgqGQd0U3//Qveti6ACt0HIJM6zJZ2wwiwbQ | ||
lr4aj+Ur/KrGWfQqaCMnnHF/Zrej8+ADtpcYWNMC/Jkdcs1feTjNtBXJ+v7c16xa4pmDaYXMnT22 | ||
QnSEG9OOKAgFBy4vAYiDf/u2axqpy/h1SM01mTFB/x0jFJIFlTlt8+/aTDeQVMW+cQLxg5Pr35NQ | ||
I+LZy2VwiSDYc9H78SKW68y7fRKAaupjiLtt8i7u01PrI2nmHP4t77AAhdEa8fya+OtdpjxnZSis | ||
n7rV//3SmoVQkXLXOxnBWIkrn5+huNd7Lj4dexjrZwMnA4VHY414/kQi4RFrglEVcltJXlESl60F | ||
DH6nHjeTmrYFKQVhCThoCwRb9aOemkkCvu0zHjvqbkiSX6CiHn0/6zTeq7v6a4+N1WvknmJrUzxH | ||
Qd8a/0sguueQqkvZ57fUse1Tkxlk |
53 changes: 53 additions & 0 deletions
53
tests/lib/assertions/test-snapd-recovery-system-pc-24.json
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
{ | ||
"type": "model", | ||
"authority-id": "test-snapd", | ||
"series": "16", | ||
"brand-id": "test-snapd", | ||
"model": "my-model", | ||
"revision": "1", | ||
"architecture": "amd64", | ||
"timestamp": "2024-04-24T00:00:00+00:00", | ||
"grade": "dangerous", | ||
"base": "core24", | ||
"serial-authority": ["generic"], | ||
"snaps": [ | ||
{ | ||
"default-channel": "24/edge", | ||
"id": "UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH", | ||
"name": "pc", | ||
"type": "gadget" | ||
}, | ||
{ | ||
"default-channel": "24/edge", | ||
"id": "pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza", | ||
"name": "pc-kernel", | ||
"type": "kernel" | ||
}, | ||
{ | ||
"default-channel": "latest/edge", | ||
"id": "dwTAh7MZZ01zyriOZErqd1JynQLiOGvM", | ||
"name": "core24", | ||
"type": "base" | ||
}, | ||
{ | ||
"default-channel": "latest/edge", | ||
"id": "PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4", | ||
"name": "snapd", | ||
"type": "snapd" | ||
}, | ||
{ | ||
"default-channel": "latest/stable", | ||
"id": "99T7MUlRhtI3U0QFgl5mXXESAiSwt776", | ||
"name": "core", | ||
"type": "core", | ||
"modes": ["run", "ephemeral"] | ||
}, | ||
{ | ||
"default-channel": "latest/stable", | ||
"id": "buPKUD3TKqCOgLEjjHx5kSiCpIs5cMuQ", | ||
"name": "hello-world", | ||
"type": "app", | ||
"modes": ["run", "ephemeral"] | ||
} | ||
] | ||
} |
61 changes: 61 additions & 0 deletions
61
tests/lib/assertions/test-snapd-recovery-system-pc-24.model
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
type: model | ||
authority-id: test-snapd | ||
revision: 1 | ||
series: 16 | ||
brand-id: test-snapd | ||
model: my-model | ||
architecture: amd64 | ||
base: core24 | ||
grade: dangerous | ||
serial-authority: | ||
- generic | ||
snaps: | ||
- | ||
default-channel: 24/edge | ||
id: UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH | ||
name: pc | ||
type: gadget | ||
- | ||
default-channel: 24/edge | ||
id: pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza | ||
name: pc-kernel | ||
type: kernel | ||
- | ||
default-channel: latest/edge | ||
id: dwTAh7MZZ01zyriOZErqd1JynQLiOGvM | ||
name: core24 | ||
type: base | ||
- | ||
default-channel: latest/edge | ||
id: PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4 | ||
name: snapd | ||
type: snapd | ||
- | ||
default-channel: latest/stable | ||
id: 99T7MUlRhtI3U0QFgl5mXXESAiSwt776 | ||
modes: | ||
- run | ||
- ephemeral | ||
name: core | ||
type: core | ||
- | ||
default-channel: latest/stable | ||
id: buPKUD3TKqCOgLEjjHx5kSiCpIs5cMuQ | ||
modes: | ||
- run | ||
- ephemeral | ||
name: hello-world | ||
type: app | ||
timestamp: 2024-04-24T00:00:00+00:00 | ||
sign-key-sha3-384: z5UoZNBNRc6KXRIg96L6tZ723_CDbUu45bRC-wcINgigB2S9GGGe6DWJqlzI6p0S | ||
|
||
AcLBcwQAAQoAHRYhBJwYfdLgNpH0AbmOCVr7utGyRTi5BQJmY0IPAAoJEFr7utGyRTi51ZMP/24y | ||
Is/CJ/K9hK/LC56K3qjVF5JUd0D+GWMTl8pJD3YgKePUlPLX0NDwm+G3KpmDX2Vqn9MzmjfGmdym | ||
9A4JhiR8G6CPFYT0yNiapUovJxdCD6O5RrW2SH7FLbpRTAgnVyt/V0q/gpFtmFTjTs/+55/m048B | ||
/Mx9L9UdYC2oBnC7b68oOm1zYbvGNgslNbsv/j0xTa5C3JEFQUvub4rLnmiiHl3EqT4mOg1j9JGV | ||
mSvysHKl6ryefe3gM5bRsHuUPpChDK8aoXOLjfeqepYjL5rNc0DoCYNZGmg7FeoapMdi/a5a5h85 | ||
8ZyCCgw1zCkxa1SIWup22gHiqjiPlTewIE9ZLk+Q6Cg1Fho8G4RAZpHUDD5UJQlyobdoZbO8gqRD | ||
vAaAYiRJjor760E7GL/GQ3RQ13tiiLBI9NzDkYlT63wuwchKrBbD/Ye88Wy1cdvhTDh0SEi9cUJj | ||
hkbDiBbri7PDpg5daHEp125oUj/4B1TfcqDdcsV6yvzpW7Z7vfijRM0bME+twNNJnAaiuAYs/m9h | ||
5KrU94DuKhJ3l23IOJheqY5p/tg5jZGi3RubJU+2hDZxVzyB+tCnWGjJVoGlxEFk1+F9neajWBSW | ||
f0oS+DpHgjbjS/7ETZ6rg1oYD+qHJh/tUYnYIcQxgVN8gOqAttnTsioaH3Jmkx4xoamWpq9W |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
{ | ||
"type": "model", | ||
"series": "16", | ||
"authority-id": "test-snapd", | ||
"brand-id": "test-snapd", | ||
"store": "CQvkdMjgbapk821Po2cF", | ||
"model": "test-snapd-remodel-pc-24", | ||
"system-user-authority": "*", | ||
"architecture": "amd64", | ||
"timestamp": "2024-04-24T00:00:00+00:00", | ||
"grade": "dangerous", | ||
"base": "core24", | ||
"snaps": [ | ||
{ | ||
"default-channel": "latest/edge", | ||
"id": "tTs9DVS01mt4L11PGqbrSiKcIxFHpUJq", | ||
"name": "test-snapd-remodel-pc-min-size", | ||
"type": "gadget" | ||
}, | ||
{ | ||
"default-channel": "24/edge", | ||
"id": "pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza", | ||
"name": "pc-kernel", | ||
"type": "kernel" | ||
}, | ||
{ | ||
"default-channel": "latest/edge", | ||
"id": "DLqre5XGLbDqg9jPtiAhRRjDuPVa5X1q", | ||
"name": "core20", | ||
"type": "base" | ||
}, | ||
{ | ||
"default-channel": "latest/edge", | ||
"id": "amcUKQILKXHHTlmSa7NMdnXSx02dNeeT", | ||
"name": "core22", | ||
"type": "base" | ||
}, | ||
{ | ||
"default-channel": "latest/edge", | ||
"id": "dwTAh7MZZ01zyriOZErqd1JynQLiOGvM", | ||
"name": "core24", | ||
"type": "base" | ||
}, | ||
{ | ||
"default-channel": "latest/stable", | ||
"id": "PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4", | ||
"name": "snapd", | ||
"type": "snapd" | ||
} | ||
] | ||
} |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
type: model | ||
authority-id: test-snapd | ||
series: 16 | ||
brand-id: test-snapd | ||
model: test-snapd-remodel-pc-24 | ||
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/edge | ||
id: pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza | ||
name: pc-kernel | ||
type: kernel | ||
- | ||
default-channel: latest/edge | ||
id: DLqre5XGLbDqg9jPtiAhRRjDuPVa5X1q | ||
name: core20 | ||
type: base | ||
- | ||
default-channel: latest/edge | ||
id: amcUKQILKXHHTlmSa7NMdnXSx02dNeeT | ||
name: core22 | ||
type: base | ||
- | ||
default-channel: latest/edge | ||
id: dwTAh7MZZ01zyriOZErqd1JynQLiOGvM | ||
name: core24 | ||
type: base | ||
- | ||
default-channel: latest/stable | ||
id: PMrrV4ml8uWuEUDBT8dSGnKUYbevVhc4 | ||
name: snapd | ||
type: snapd | ||
store: CQvkdMjgbapk821Po2cF | ||
system-user-authority: * | ||
timestamp: 2024-04-24T00:00:00+00:00 | ||
sign-key-sha3-384: z5UoZNBNRc6KXRIg96L6tZ723_CDbUu45bRC-wcINgigB2S9GGGe6DWJqlzI6p0S | ||
|
||
AcLBcwQAAQoAHRYhBJwYfdLgNpH0AbmOCVr7utGyRTi5BQJmKGN/AAoJEFr7utGyRTi57PMP/izp | ||
k6X8iSflQDc06niCh0L2dHb1rRDa4IAYFfLpw6jbevwqkEaL+9v/2aprt6EUDMG70Iukel29sbcA | ||
15x7k8GUEUNskHDG2cbDqBzQ8GJJ625g8KwBiKjxgsoB9sG3KeLKhTgb3DhgoLhT58NC8wg7NcGZ | ||
04NapWyeZ+BhI3kQ+kBUXlEQiwiimpweetG+wdWK4dqYQ91rtcLaYjvwM8Cfej3/OxCazKvKV0Cj | ||
Ppyjic0GdLN5l40tocwX4KqSpp9FBsflttquzxTpEbR/+vtc1pUcoIfY9Z+dg8mUIlKzatM6Tueo | ||
71ktVewr/naWsdlFz2u29P0OtbdIhClZCN30jlzAS2ExudKtNRTso1lnuxBpacddSQjKEaw8lmWE | ||
fMBQCZaIAG4Ygl5e30H/VK7Sqfot2TxCKVnwzVVVf9pynYaXgoAXrAH7AWlW8axB+xnu4WyAE3tx | ||
4DGq0rEQp01qF2n0PmWUPWW4uJ9U3c8ah0viwDX20muI6bQ0zhzLfm8YMC3h7/y6h7VCLOxruqRG | ||
LEyv29AJlSDlqaVD1HOsaP2x/Vsz9AvHTVJgmoukbQblW6vw3TqqXxNzLqHHm9HVLzRMSRrijOHN | ||
zD5BT+GnEHCZBcGKxiXftA/joQhc51PTpTgncY2O5ctJXkwh3bgoK0gXdC2q/qh0nG7WqmtU |
57 changes: 57 additions & 0 deletions
57
tests/lib/assertions/test-snapd-remodel-invalid-vset-pc-24.json
This file contains 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
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-24T00:00:00+00:00", | ||
"grade": "dangerous", | ||
"base": "core24", | ||
"serial-authority": ["generic"], | ||
"validation-sets": [ | ||
{ | ||
"name": "test-snapd-invalid-hello-world", | ||
"mode": "enforce" | ||
} | ||
], | ||
"snaps": [ | ||
{ | ||
"default-channel": "24/edge", | ||
"id": "UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH", | ||
"name": "pc", | ||
"type": "gadget" | ||
}, | ||
{ | ||
"default-channel": "24/edge", | ||
"id": "pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza", | ||
"name": "pc-kernel", | ||
"type": "kernel" | ||
}, | ||
{ | ||
"default-channel": "latest/edge", | ||
"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" | ||
} | ||
] | ||
} |
Oops, something went wrong.