Commit a819c6e
authored
[3rd-party images] Retrieve Debian and Fedora images (#4293)
Several notables changes presented here:
1. Debian and Fedora images presented in `multipass find`:
Details for 3rd-party cloud images are located in
`data/distributions/distribution-info.json` and roughly follow the
format of `VMImageInfo` and `simplestreams`. Once this PR is merged in,
the `CustomVMImageHost` will fetch this file from the Multipass GitHub
repository. For local developer testing, the environment variable
`MULTIPASS_DISTRIBUTIONS_URL` can be set to a local directory, i.e.
`file:///Users/you/path/to/your/manifest.json`. Reported images are
sorted in descending order by their `remote_name` placing 3rd-party
images at the bottom of the list, since the remote name is empty.
2. Ubuntu Core images are now fetched via the `UbuntuVMImageHost` class:
Ubuntu Core images utilize
[simplestreams](https://cdimage.ubuntu.com/ubuntu-core/streams/v1/com.ubuntu.cdimage:ubuntu-core.json)
for distribution. Several tweaks were made to
`simple_streams_manifest.cpp` to accommodate them. As a result, core
images are also now reported on ARM64 CPU architectures.
3. Golden files extracted out of `test_output_formatter.cpp`:
Test files for the formatters are now located under
`tests/test_data/formatters/<formatter>/`. This eliminates the need for
escaping characters, line length linting, and translating text output
from the command line into C++ strings.
4. Removed hardcoded "Ubuntu" strings within formatters, installers, and
CLI
- remove hardcoded "Ubuntu" strings from `info` and `list` formatters
- retroactively populate the image vault with new `OS` field
- fix bug where query type was not being loaded from the DB correctly
- this function will need to be removed in a future release of
Multipass, although the function is idempotent
- all pre-existing instances will have the field populated with "Ubuntu"
- remove specific references to Ubuntu within the CLI and installer in
favour of more generic "cloud VMs/instances"
5. Fedora compatible disk info fetching
- Include BTRFS filesystems when counting disk info
- Filter out filesystems that are mounted on multiple directories
6. Drive-by fixes:
- Determining the location of `test_data` is now done at compile time
rather than runtime allowing the use of the location in objects that are
constructed at compile time.
- Moved image host classes to their own subdirectory and renamed some
classes to follow the established inheritance format of `virtual` ->
`base` -> implementation.
- `test_data` persistence optimization:
- When templated test files, i.e. `*\.in$`, are edited or new files are
added to `test_data`, a reconfigure is triggered by cmake.
- Non-templated test files are persisted into the build directory at
compile time if they have been edited.
- New exception type; `ImageNotFoundException`, created for when an
image is not found.
- Optimized sending of `remote_name` in the `FindReply` `protobuf`
message type.
Fixes #3541
---
MULTI-2048
MULTI-2074
MULTI-2151
MULTI-2153File tree
188 files changed
+3033
-2243
lines changed- .github/workflows
- data/distributions
- include/multipass
- cli
- exceptions
- image_host
- packaging
- macos
- windows/wix
- snap
- src
- client
- cli
- cmd
- formatter
- gui/lib/catalogue
- daemon
- image_host
- network
- rpc
- simplestreams
- utils
- tests
- qemu
- test_data
- custom_image_host
- formatters
- csv
- json
- table
- yaml
- simple_streams_index
- simple_streams_manifest
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
188 files changed
+3033
-2243
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
40 | | - | |
41 | | - | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
42 | 43 | | |
43 | 44 | | |
44 | 45 | | |
| |||
51 | 52 | | |
52 | 53 | | |
53 | 54 | | |
54 | | - | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
55 | 60 | | |
56 | 61 | | |
57 | 62 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
| 41 | + | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
| 47 | + | |
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
| |||
135 | 135 | | |
136 | 136 | | |
137 | 137 | | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
148 | | - | |
149 | | - | |
150 | | - | |
151 | | - | |
152 | | - | |
153 | | - | |
154 | | - | |
155 | | - | |
156 | | - | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
| 31 | + | |
30 | 32 | | |
| 33 | + | |
31 | 34 | | |
32 | 35 | | |
33 | 36 | | |
| |||
44 | 47 | | |
45 | 48 | | |
46 | 49 | | |
| 50 | + | |
47 | 51 | | |
48 | 52 | | |
49 | 53 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
Lines changed: 9 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| |||
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
30 | | - | |
| 31 | + | |
31 | 32 | | |
32 | 33 | | |
| 34 | + | |
| 35 | + | |
33 | 36 | | |
34 | 37 | | |
35 | | - | |
| 38 | + | |
36 | 39 | | |
37 | 40 | | |
38 | 41 | | |
| |||
41 | 44 | | |
42 | 45 | | |
43 | 46 | | |
44 | | - | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
45 | 50 | | |
46 | 51 | | |
47 | 52 | | |
Lines changed: 7 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
24 | | - | |
25 | 25 | | |
26 | | - | |
27 | | - | |
28 | 26 | | |
29 | 27 | | |
30 | 28 | | |
| |||
39 | 37 | | |
40 | 38 | | |
41 | 39 | | |
42 | | - | |
| 40 | + | |
43 | 41 | | |
44 | 42 | | |
45 | | - | |
| 43 | + | |
46 | 44 | | |
47 | 45 | | |
48 | 46 | | |
| |||
53 | 51 | | |
54 | 52 | | |
55 | 53 | | |
56 | | - | |
| 54 | + | |
57 | 55 | | |
58 | 56 | | |
59 | 57 | | |
60 | 58 | | |
61 | | - | |
62 | | - | |
63 | | - | |
| 59 | + | |
| 60 | + | |
64 | 61 | | |
65 | 62 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
0 commit comments