Adapt yaml files to new data structure for libyui with storage-ng v4.3

Unify the fact that there are default options which do not require any key in the yaml file and which the automation can handle without being specified. Other action require explicit 'do it' or explicit 'no do it' and the automation should provide some hint about what are the available keys in case of failure.
os-autoinst · Jan 25, 2021 · 353e824 · 353e824
1 parent 41539ad
commit 353e824
Show file tree

Hide file tree

Showing 87 changed files with 1,020 additions and 1,726 deletions.
diff --git a/schedule/staging/RAID1@64bit-staging.yaml b/schedule/staging/RAID1@64bit-staging.yaml
@@ -42,18 +42,10 @@ test_data:
       chunk_size: 64
       device_selection_step: 2
       partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-        mounting_options:
-          should_mount: 1
+        role: system
     - raid_level: 0
       chunk_size: 64
       device_selection_step: 1
       partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-          filesystem: swap
-        mounting_options:
-          should_mount: 1
+        role: system
+        filesystem: Swap
diff --git a/schedule/yast/btrfs/btrfs+warnings_opensuse.yaml b/schedule/yast/btrfs/btrfs+warnings_opensuse.yaml
@@ -49,17 +49,13 @@ test_data:
       partitions:
         <<: !include test_data/yast/btrfs/common/btrfs+warnings_partitions.yaml
         rootfs_small:
-          - role: raw-volume
+          - role: raw
             size: 2mb
-            id: bios-boot
-          - role: operating-system
+            id: BIOS Boot Partition
+          - role: system
             size: 4GiB
-            formatting_options:
-              should_format: 1
-              filesystem: xfs
-            mounting_options:
-              should_mount: 1
-              mount_point: /
+            filesystem: XFS
+            mount_point: /
   errors:
     <<: !include test_data/yast/btrfs/common/btrfs+warnings_errors.yaml
   warnings:

diff --git a/schedule/yast/detect_yast2_failures.yaml b/schedule/yast/detect_yast2_failures.yaml
@@ -38,18 +38,10 @@ test_data:
       chunk_size: 64
       device_selection_step: 2
       partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-        mounting_options:
-          should_mount: 1
+        role: system
     - raid_level: 0
       chunk_size: 64
       device_selection_step: 1
       partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-          filesystem: swap
-        mounting_options:
-          should_mount: 1
+        role: system
+        filesystem: Swap
diff --git a/schedule/yast/encryption/lvm_encrypt_separate_boot_opensuse.yaml b/schedule/yast/encryption/lvm_encrypt_separate_boot_opensuse.yaml
@@ -36,32 +36,3 @@ schedule:
   - shutdown/grub_set_bootargs
   - console/validate_lvm
   - console/validate_encrypt
-test_data:
-  disks:
-  - name: vda
-    partitions:
-      - size: 2MiB
-        role: raw-volume
-        id: bios-boot
-      - size: 500MiB
-        role: operating-system
-        formatting_options:
-          should_format: 1
-          filesystem: ext2
-        mounting_options:
-          should_mount: 1
-          mount_point: /boot
-      - role: raw-volume
-        id: linux-lvm
-        encrypt_device: 1
-  lvm:
-    volume_groups:
-    - name: vg-system
-      devices:
-        - /dev/vda3
-      logical_volumes:
-        - name: lv-swap
-          size: 2000MiB
-          role: swap
-        - name: lv-root
-          role: operating-system
diff --git a/schedule/yast/encryption/lvm_full_encrypt_opensuse.yaml b/schedule/yast/encryption/lvm_full_encrypt_opensuse.yaml
@@ -44,10 +44,10 @@ test_data:
   - name: vda
     partitions:
       - size: 2MiB
-        role: raw-volume
-        id: bios-boot
-      - role: raw-volume
-        id: linux-lvm
+        role: raw
+        id: BIOS Boot Partition
+      - role: raw
+        id: Linux LVM
         encrypt_device: 1
   lvm:
     volume_groups:
@@ -59,4 +59,4 @@ test_data:
           size: 2000MiB
           role: swap
         - name: lv-root
-          role: operating-system
+          role: system
diff --git a/schedule/yast/lvm/lvm+resize_lv.yaml b/schedule/yast/lvm/lvm+resize_lv.yaml
@@ -45,7 +45,5 @@ test_data:
       logical_volumes:
         - name: root
           size: 45G
-          formatting_options:
-            filesystem: btrfs
-          mounting_options:
-            mount_point: /
+          filesystem: Btrfs
+          mount_point: /
diff --git a/schedule/yast/lvm/lvm+resize_root.yaml b/schedule/yast/lvm/lvm+resize_root.yaml
@@ -47,10 +47,8 @@ test_data:
       logical_volumes:
         - name: root
           size: 45G
-          formatting_options:
-            filesystem: btrfs
-          mounting_options:
-            mount_point: /
+          filesystem: Btrfs
+          mount_point: /
   root:
     disk: current-volume-management
     existing_partition: root

diff --git a/schedule/yast/raid/raid0_opensuse_gpt.yaml b/schedule/yast/raid/raid0_opensuse_gpt.yaml
@@ -40,18 +40,10 @@ test_data:
       chunk_size: 64
       device_selection_step: 2
       partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-        mounting_options:
-          should_mount: 1
+        role: system
     - raid_level: 0
       chunk_size: 64
       device_selection_step: 1
       partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-          filesystem: swap
-        mounting_options:
-          should_mount: 1
+        role: system
+        filesystem: Swap
diff --git a/schedule/yast/raid/raid0_sle_gpt.yaml b/schedule/yast/raid/raid0_sle_gpt.yaml
@@ -42,18 +42,10 @@ test_data:
       chunk_size: 64
       device_selection_step: 2
       partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-        mounting_options:
-          should_mount: 1
+        role: system
     - raid_level: 0
       chunk_size: 64
       device_selection_step: 1
       partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-          filesystem: swap
-        mounting_options:
-          should_mount: 1
+        role: system
+        filesystem: Swap
diff --git a/schedule/yast/raid/raid0_sle_gpt_prep_boot_pvm.yaml b/schedule/yast/raid/raid0_sle_gpt_prep_boot_pvm.yaml
@@ -43,29 +43,16 @@ test_data:
       chunk_size: 64
       device_selection_step: 3
       partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-        mounting_options:
-          should_mount: 1
+        role: system
     - raid_level: 1
       chunk_size: 64
       device_selection_step: 2
       partition:
         role: data
-        formatting_options:
-          should_format: 1
-          filesystem: ext4
-        mounting_options:
-          should_mount: 1
-          mount_point: '/boot'
+        filesystem: Ext4
+        mount_point: '/boot'
     - raid_level: 0
       chunk_size: 64
       device_selection_step: 1
       partition:
         role: swap
-        formatting_options:
-          should_format: 1
-        filesystem: swap
-        mounting_options:
-          should_mount: 1
diff --git a/schedule/yast/raid/raid10_opensuse_gpt.yaml b/schedule/yast/raid/raid10_opensuse_gpt.yaml
@@ -40,18 +40,10 @@ test_data:
       chunk_size: 64
       device_selection_step: 2
       partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-        mounting_options:
-          should_mount: 1
+        role: system
     - raid_level: 0
       chunk_size: 64
       device_selection_step: 1
       partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-          filesystem: swap
-        mounting_options:
-          should_mount: 1
+        role: system
+        filesystem: Swap
diff --git a/schedule/yast/raid/raid10_sle_gpt.yaml b/schedule/yast/raid/raid10_sle_gpt.yaml
@@ -42,18 +42,9 @@ test_data:
       chunk_size: 64
       device_selection_step: 2
       partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-        mounting_options:
-          should_mount: 1
+        role: system
     - raid_level: 0
       chunk_size: 64
       device_selection_step: 1
       partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-          filesystem: swap
-        mounting_options:
-          should_mount: 1
+        role: system
diff --git a/schedule/yast/raid/raid10_sle_gpt_prep_boot_pvm.yaml b/schedule/yast/raid/raid10_sle_gpt_prep_boot_pvm.yaml
@@ -43,29 +43,16 @@ test_data:
       chunk_size: 64
       device_selection_step: 3
       partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-        mounting_options:
-          should_mount: 1
+        role: system
     - raid_level: 1
       chunk_size: 64
       device_selection_step: 2
       partition:
         role: data
-        formatting_options:
-          should_format: 1
-          filesystem: ext4
-        mounting_options:
-          should_mount: 1
-          mount_point: '/boot'
+        filesystem: Ext4
+        mount_point: /boot
     - raid_level: 0
       chunk_size: 64
       device_selection_step: 1
       partition:
         role: swap
-        formatting_options:
-          should_format: 1
-        filesystem: swap
-        mounting_options:
-          should_mount: 1
diff --git a/schedule/yast/raid/raid10_sle_msdos.yaml b/schedule/yast/raid/raid10_sle_msdos.yaml
@@ -37,75 +37,62 @@ test_data:
     - name: vda
       partitions:
         - size: 8000mb
-          role: raw-volume
-          id: linux-raid
+          role: raw
+          id: Linux RAID
         - size: 300mb
-          id: linux-raid
-          role: raw-volume
+          id: Linux RAID
+          role: raw
         - size: 100mb
-          role: raw-volume
-          id: linux-raid
+          role: raw
+          id: Linux RAID
     - name: vdb
       partitions:
         - size: 8000mb
-          role: raw-volume
-          id: linux-raid
+          role: raw
+          id: Linux RAID
         - size: 300mb
-          id: linux-raid
-          role: raw-volume
+          id: Linux RAID
+          role: raw
         - size: 100mb
-          role: raw-volume
-          id: linux-raid
+          role: raw
+          id: Linux RAID
     - name: vdc
       partitions:
         - size: 8000mb
-          role: raw-volume
-          id: linux-raid
+          role: raw
+          id: Linux RAID
         - size: 300mb
-          id: linux-raid
-          role: raw-volume
+          id: Linux RAID
+          role: raw
         - size: 100mb
-          role: raw-volume
-          id: linux-raid
+          role: raw
+          id: Linux RAID
     - name: vdd
       partitions:
         - size: 8000mb
-          role: raw-volume
-          id: linux-raid
+          role: raw
+          id: Linux RAID
         - size: 300mb
-          id: linux-raid
-          role: raw-volume
+          id: Linux RAID
+          role: raw
         - size: 100mb
-          role: raw-volume
-          id: linux-raid
+          role: raw
+          id: Linux RAID
   mds:
     - raid_level: 10
       chunk_size: 64
       device_selection_step: 3
       partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-        mounting_options:
-          should_mount: 1
+        role: system
     - raid_level: 1
       chunk_size: 64
       device_selection_step: 2
       partition:
         role: data
-        formatting_options:
-          should_format: 1
-          filesystem: ext4
-        mounting_options:
-          should_mount: 1
-          mount_point: '/boot'
+        filesystem: Ext4
+        mount_point: /boot
     - raid_level: 0
       chunk_size: 64
       device_selection_step: 1
       partition:
         role: swap
-        formatting_options:
-          should_format: 1
-          filesystem: swap
-        mounting_options:
-          should_mount: 1