curtin

Merge ~mwhudson/curtin:extract-partuuid into curtin:master

  1. Git
  2. lp:~mwhudson/curtin
  3. extract-partuuid
  4. Merge into master
Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: aa2500c0c9b13e0b332e1c5d161a84314f9b784a
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~mwhudson/curtin:extract-partuuid
Merge into: curtin:master
Diff against target: 28 lines (+6/-0)
2 files modified
curtin/storage_config.py (+5/-0)
tests/unittests/test_storage_config.py (+1/-0)
Reviewer Review Type Date Requested Status
Dan Bungert Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+448842@code.launchpad.net

Commit message

storage_config: include partition uuids for gpt partitions

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:aa2500c0c9b13e0b332e1c5d161a84314f9b784a
https://jenkins.canonical.com/server-team/job/curtin-ci/170/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-amd64/170/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-arm64/170/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-ppc64el/170/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-s390x/170/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/curtin-ci/170//rebuild

review: Approve (continuous-integration)
Revision history for this message
Dan Bungert (dbungert) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/curtin/storage_config.py b/curtin/storage_config.py
2index 329183a..d5092dd 100644
3--- a/curtin/storage_config.py
4+++ b/curtin/storage_config.py
5@@ -802,6 +802,11 @@ class BlockdevParser(ProbertParser):
6 if ptable:
7 entry['size'] *= 512
8
9+ if blockdev_data.get('ID_PART_TABLE_TYPE') == 'gpt':
10+ part_uuid = blockdev_data.get('ID_PART_ENTRY_UUID')
11+ if part_uuid is not None:
12+ entry['uuid'] = part_uuid
13+
14 ptype = blockdev_data.get('ID_PART_ENTRY_TYPE')
15 if ptype is not None:
16 entry['partition_type'] = ptype
17diff --git a/tests/unittests/test_storage_config.py b/tests/unittests/test_storage_config.py
18index 724757b..b032bf4 100644
19--- a/tests/unittests/test_storage_config.py
20+++ b/tests/unittests/test_storage_config.py
21@@ -351,6 +351,7 @@ class TestBlockdevParser(CiTestCase):
22 'size': 499122176,
23 'flag': 'linux',
24 'partition_type': '0fc63daf-8483-4772-8e79-3d69d8477de4',
25+ 'uuid': '6347e694-3680-481f-b3b9-f13090855467',
26 }
27 self.assertDictEqual(expected_dict,
28 self.bdevp.asdict(blockdev))

Subscribers

People subscribed via source and target branches