Merge ~smoser/curtin:cleanup/make-basic-uefi-more-basic-no-xfs into curtin:master

[Scott Moser]

tests: remove xfs filesystem from basic uefi test.

The test_uefi_basic.py file reports to be 'basic' test of uefi.
However, it also tests xfs filesystem support.
In order to make it more basic, just drop the xfs.

The real motivation here is to later enable a precise (12.04)
installation test done inside a 14.04 or 16.04 environment.
Each of those scenarios cause mounting problems of the xfs partition
when the 12.04 kernel boots. That is because the mkfs.xfs command
enabled options that were not supported in the older kernel.

see commit message

[Scott Moser (smoser)]

related
 https://code.launchpad.net/~smoser/curtin/+git/curtin/+merge/336872

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

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

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

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

I would have been happy with a s,xfs,ext4,g but sure.

review: Approve

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

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

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

review: Approve (continuous-integration)

diff --git a/examples/tests/uefi_basic.yaml b/examples/tests/uefi_basic.yaml
index 25d896c..1f49fa9 100644
--- a/examples/tests/uefi_basic.yaml
+++ b/examples/tests/uefi_basic.yaml
@@ -30,12 +30,6 @@ storage:
     size: 3G
     type: partition
     wipe: superblock
-  - id: id_disk0_part3
-    number: 3
-    size: 1G
-    type: partition
-    wipe: superblock
-    device: id_disk0
   - fstype: fat32
     id: id_efi_format
     label: efi
@@ -46,19 +40,10 @@ storage:
     label: root
     type: format
     volume: id_disk0_part2
-  - id: id_home_format
-    label: home
-    type: format
-    fstype: xfs
-    volume: id_disk0_part3
   - device: id_root_format
     id: id_root_mount
     path: /
     type: mount
-  - device: id_home_format
-    type: mount
-    path: /home
-    id: id_home_mount
   - device: id_efi_format
     id: id_efi_mount
     path: /boot/efi
diff --git a/tests/vmtests/test_uefi_basic.py b/tests/vmtests/test_uefi_basic.py
index 1fbf162..712075c 100644
--- a/tests/vmtests/test_uefi_basic.py
+++ b/tests/vmtests/test_uefi_basic.py
@@ -13,7 +13,7 @@ class TestBasicAbs(VMBaseClass):
     conf_file = "examples/tests/uefi_basic.yaml"
     extra_disks = ['4G']
     uefi = True
-    disk_to_check = [('main_disk', 1), ('main_disk', 2), ('main_disk', 3)]
+    disk_to_check = [('main_disk', 1), ('main_disk', 2)]
     collect_scripts = VMBaseClass.collect_scripts + [textwrap.dedent("""
         cd OUTPUT_COLLECT_D
         blkid -o export /dev/vda > blkid_output_vda