Merge ~mwhudson/curtin:virt-dasds into curtin:master

[Michael Hudson-Doyle]

storage_config: set ptable to vtoc for 'virt' dasds as well as 'ECKD'

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

FAILED: Continuous integration, rev:3dfd1caff85c98bc4c230fbd2733d7a006381c1e
https://jenkins.ubuntu.com/server/job/curtin-ci/61/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/61/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/61/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/61/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/61/

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

review: Needs Fixing (continuous-integration)

[Paride Legovini (paride)]

The pylint run is flaky and *sometimes* fails with errors like:

curtin/commands/install_grub.py:88:19: E1101: Instance of 'Distros' has no 'debian' member (no-member)
curtin/commands/install_grub.py:150:28: E1101: Instance of 'Distros' has no 'redhat' member (no-member)
curtin/commands/install_grub.py:235:28: E1101: Instance of 'Distros' has no 'debian' member (no-member)

I can reproduce it locally by running `tox -e py3-pylint` a few times in a row.

Full build log:

https://paste.ubuntu.com/p/ZccwRk3MP3/

Retriggering build.

[Michael Hudson-Doyle (mwhudson)]

How does pylint end up being flak!?!? Thanks.

On Thu, 14 Jan 2021, 23:32 Paride Legovini, <email address hidden>
wrote:

> The pylint run is flaky and *sometimes* fails with errors like:
>
> curtin/commands/install_grub.py:88:19: E1101: Instance of 'Distros' has no
> 'debian' member (no-member)
> curtin/commands/install_grub.py:150:28: E1101: Instance of 'Distros' has
> no 'redhat' member (no-member)
> curtin/commands/install_grub.py:235:28: E1101: Instance of 'Distros' has
> no 'debian' member (no-member)
>
> I can reproduce it locally by running `tox -e py3-pylint` a few times in a
> row.
>
> Full build log:
>
> https://paste.ubuntu.com/p/ZccwRk3MP3/
>
> Retriggering build.
> --
> https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/396281
> You are the owner of ~mwhudson/curtin:virt-dasds.
>

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

PASSED: Continuous integration, rev:3dfd1caff85c98bc4c230fbd2733d7a006381c1e
https://jenkins.ubuntu.com/server/job/curtin-ci/62/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/62/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/62/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/62/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/62/

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

review: Approve (continuous-integration)

[Michael Hudson-Doyle (mwhudson)]

Frank tested this, it helps (although a subiquity change is required as well)

diff --git a/curtin/storage_config.py b/curtin/storage_config.py
index b66877c..e6c33cc 100644
--- a/curtin/storage_config.py
+++ b/curtin/storage_config.py
@@ -771,18 +771,20 @@ class BlockdevParser(ProbertParser):
             # disk entry for ECKD dasds needs device_id and check for vtoc
             # ptable
             dasd_config = self.probe_data.get('dasd', {}).get(devname)
-            if dasd_config is not None and \
-               dasd_config.get('type', 'ECKD') == 'ECKD':
-                device_id = (
-                    blockdev_data.get('ID_PATH', '').replace('ccw-', ''))
-                if device_id:
-                    entry['device_id'] = device_id
-
-                # if dasd has been formatted, attrs.size is non-zero
-                # formatted ECKD dasds have ptable type of 'vtoc'
-                dasd_size = blockdev_data.get('attrs', {}).get('size', "0")
-                if dasd_size != "0":
-                    entry['ptable'] = 'vtoc'
+            if dasd_config is not None:
+                dasd_type = dasd_config.get('type', 'ECKD')
+                if dasd_type == 'ECKD':
+                    device_id = (
+                        blockdev_data.get('ID_PATH', '').replace('ccw-', ''))
+                    if device_id:
+                        entry['device_id'] = device_id
+
+                if dasd_type in ['ECKD', 'virt']:
+                    # if dasd has been formatted, attrs.size is non-zero
+                    # formatted ECKD dasds have ptable type of 'vtoc'
+                    dasd_size = blockdev_data.get('attrs', {}).get('size', "0")
+                    if dasd_size != "0":
+                        entry['ptable'] = 'vtoc'
 
             if 'ID_PART_TABLE_TYPE' in blockdev_data:
                 ptype = blockdev_data['ID_PART_TABLE_TYPE']