Merge ~raharper/curtin:fix/schema-add-raid-metadata into curtin:master

[Ryan Harper]

block-schema: update raid schema for preserve and metadata

Curtin can now accept type: raid storage config which sets the
'preserve' boolean to 'true' which informs curtin that it does
not need to create a new raid device.

We also accept a 'metadata' version hint in the schema as curtin
passes this value along as info to users of block-discover.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:8ad14f0933606644020e08740fd63d436176013a
https://jenkins.ubuntu.com/server/job/curtin-ci/3731/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/3731/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/3731/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/3731/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/3731/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/3731//rebuild

review: Approve (continuous-integration)

[Dan Watkins (oddbloke)]

Should this be adding a wipe property too?

review: Needs Information

[Ryan Harper (raharper)]

Yes. Yes it should. I'll fix.

[Ryan Harper (raharper)]

Actually, we don't yet support that; I've a separate task for preserve composed devices and wiping them; which is a variant of the keep this raid around and mount it at a specific location use-case that uses the preserve and metadata keys.

I'll reword the commit.

[Dan Watkins (oddbloke)]

review: Approve (we did it)

diff --git a/curtin/block/schemas.py b/curtin/block/schemas.py
index 3d36026..07e4143 100644
--- a/curtin/block/schemas.py
+++ b/curtin/block/schemas.py
@@ -298,6 +298,8 @@ RAID = {
         'devices': {'$ref': '#/definitions/devices'},
         'name': {'$ref': '#/definitions/name'},
         'mdname': {'$ref': '#/definitions/name'},  # XXX: Docs need updating
+        'metadata': {'type': ['string', 'number']},
+        'preserve': {'$ref': '#/definitions/preserve'},
         'ptable': {'$ref': '#/definitions/ptable'},
         'spare_devices': {'$ref': '#/definitions/devices'},
         'type': {'const': 'raid'},