1
diff --git a/curtin/commands/block_meta.py b/curtin/commands/block_meta.py
2
index e3c4ce1..65e779f 100644
3
--- a/curtin/commands/block_meta.py
4
+++ b/curtin/commands/block_meta.py
5
@@ -1692,8 +1692,8 @@ def zfs_handler(info, storage_config):
6
1692
1692
7
1693
1693
8
1694
def get_device_paths_from_storage_config(storage_config):
1694
def get_device_paths_from_storage_config(storage_config):
11
1695
    """Returns a list of device paths in a storage config filtering out
1695
    """Returns a list of device paths in a storage config which have wipe
12
1696
       preserved or devices which do not have wipe configuration.
1696
       config enabled.
13
1697
1697
14
1698
    :param: storage_config: Ordered dict of storage configation
1698
    :param: storage_config: Ordered dict of storage configation
15
1699
    """
1699
    """
16
@@ -1701,8 +1701,6 @@ def get_device_paths_from_storage_config(storage_config):
17
1701
    for (k, v) in storage_config.items():
1701
    for (k, v) in storage_config.items():
18
1702
        if v.get('type') in ['disk', 'partition']:
1702
        if v.get('type') in ['disk', 'partition']:
19
1703
            if config.value_as_boolean(v.get('wipe')):
1703
            if config.value_as_boolean(v.get('wipe')):
20
1704
                if config.value_as_boolean(v.get('preserve')):
21
1705
                    continue
22
1706
                try:
1704
                try:
23
1707
                    dpaths.append(
1705
                    dpaths.append(
24
1708
                        get_path_to_storage_volume(k, storage_config))
1706
                        get_path_to_storage_volume(k, storage_config))
25
diff --git a/examples/tests/preserve-partition-wipe-vg-simple.yaml b/examples/tests/preserve-partition-wipe-vg-simple.yaml
26
1709
new file mode 100644
1707
new file mode 100644
27
index 0000000..662f34f
28
--- /dev/null
29
+++ b/examples/tests/preserve-partition-wipe-vg-simple.yaml
30
@@ -0,0 +1,62 @@
31
1
showtrace: true
32
2
33
3
bucket:
34
4
  - &setup |
35
5
    parted /dev/disk/by-id/virtio-disk-a --script -- \
36
6
        mklabel gpt                   \
37
7
        mkpart primary ext4 2MiB 4MiB \
38
8
        set 1 bios_grub on            \
39
9
        mkpart primary ext4 4GiB 7GiB
40
10
    udevadm settle
41
11
    ls -al /dev/disk/by-id
42
12
    vgcreate --force --zero=y --yes root_vg /dev/disk/by-id/virtio-disk-a-part2
43
13
    pvscan --cache
44
14
    vgscan --mknodes --cache
45
15
    vgs
46
16
    lvcreate root_vg --name lv1_root --zero=y --wipesignatures=y \
47
17
        --size 2G
48
18
    udevadm settle
49
19
    lvs
50
20
    ls -al /dev/disk/by-id
51
21
52
22
# Partition the disk now to test curtin's reuse of partitions.
53
23
early_commands:
54
24
  00-setup-disk: [sh, -exuc, *setup]
55
25
56
26
storage:
57
27
  config:
58
28
  - ptable: gpt
59
29
    serial: disk-a
60
30
    preserve: true
61
31
    name: disk-a
62
32
    grub_device: true
63
33
    type: disk
64
34
    id: disk-sda
65
35
  - device: disk-sda
66
36
    size: 2097152
67
37
    flag: bios_grub
68
38
    preserve: true
69
39
    number: 1
70
40
    type: partition
71
41
    id: disk-sda-part-1
72
42
  - device: disk-sda
73
43
    size: 3G
74
44
    flag: linux
75
45
    preserve: true
76
46
    number: 2
77
47
    wipe: zero
78
48
    type: partition
79
49
    id: disk-sda-part-2
80
50
  - fstype: ext4
81
51
    volume: disk-sda-part-2
82
52
    preserve: false
83
53
    type: format
84
54
    id: format-0
85
55
  - device: format-0
86
56
    path: /
87
57
    type: mount
88
58
    id: mount-0
89
59
  version: 1
90
60
91
61
verbosity: 3
92
62
93
diff --git a/tests/vmtests/test_preserve_partition_wipe_vg.py b/tests/vmtests/test_preserve_partition_wipe_vg.py
94
index b779ad1..96346ff 100644
95
--- a/tests/vmtests/test_preserve_partition_wipe_vg.py
96
+++ b/tests/vmtests/test_preserve_partition_wipe_vg.py
97
@@ -33,4 +33,27 @@ class FocalTestPreserveWipeLvm(relbase.focal, TestPreserveWipeLvm):
98
33
    __test__ = True
33
    __test__ = True
99
34
34
100
35
35
101
36
class TestPreserveWipeLvmSimple(VMBaseClass):
102
37
    conf_file = "examples/tests/preserve-partition-wipe-vg-simple.yaml"
103
38
    uefi = False
104
39
    extra_collect_scripts = [textwrap.dedent("""
105
40
        cd OUTPUT_COLLECT_D
106
41
        ls /opt > ls-opt
107
42
        exit 0
108
43
        """)]
109
44
110
45
111
46
class BionicTestPreserveWipeLvmSimple(relbase.bionic,
112
47
                                      TestPreserveWipeLvmSimple):
113
48
    __test__ = True
114
49
115
50
116
51
class EoanTestPreserveWipeLvmSimple(relbase.eoan, TestPreserveWipeLvmSimple):
117
52
    __test__ = True
118
53
119
54
120
55
class FocalTestPreserveWipeLvmSimple(relbase.focal, TestPreserveWipeLvmSimple):
121
56
    __test__ = True
122
57
123
58
124
36
# vi: ts=4 expandtab syntax=python
59
# vi: ts=4 expandtab syntax=python
Reviewer	Review Type	Date Requested	Status
Server Team CI bot	continuous-integration		Approve on 2020-04-20
Paride Legovini			Approve on 2020-04-20
Michael Hudson-Doyle			Approve on 2020-04-20
Chad Smith		2020-04-17	Pending
Review via email: mp+382505@code.launchpad.net