From bd079363675cd87a8f8e1f39035f4ddfb1ae3abe Mon Sep 17 00:00:00 2001
From: Xiaofeng Wang <henrywangxf@me.com>
Date: Wed, 14 Apr 2021 23:13:29 +0800
Subject: [PATCH] test: Install and run ostree commit on UEFI VM

Update ostree-ng.sh to install and run ostree commit on UEFI VM
ostree.sh keeps on BIOS VM. Both of BIOS and UEFI are covered.
check_ostree.yaml ansible playbook has to be updated to support
both BISO and UEFI
---
 test/cases/ostree-ng.sh             |  7 ++----
 test/data/ansible/check_ostree.yaml | 37 +++++++++++++++++++----------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/test/cases/ostree-ng.sh b/test/cases/ostree-ng.sh
index fc7b24e98..1bf6837f1 100755
--- a/test/cases/ostree-ng.sh
+++ b/test/cases/ostree-ng.sh
@@ -168,11 +168,7 @@ wait_for_ssh_up () {
 clean_up () {
     greenprint "🧼 Cleaning up"
     sudo virsh destroy "${IMAGE_KEY}"
-    if [[ $ARCH == aarch64 ]]; then
-        sudo virsh undefine "${IMAGE_KEY}" --nvram
-    else
-        sudo virsh undefine "${IMAGE_KEY}"
-    fi
+    sudo virsh undefine "${IMAGE_KEY}" --nvram
     # Remove qcow2 file.
     sudo rm -f "$LIBVIRT_IMAGE_PATH"
 
@@ -389,6 +385,7 @@ sudo virt-install  --initrd-inject="${KS_FILE}" \
                    --os-type linux \
                    --os-variant ${OS_VARIANT} \
                    --location "/var/lib/libvirt/images/${ISO_FILENAME}" \
+                   --boot uefi,loader_ro=yes,loader_type=pflash,nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd,loader_secure=no \
                    --nographics \
                    --noautoconsole \
                    --wait=-1 \
diff --git a/test/data/ansible/check_ostree.yaml b/test/data/ansible/check_ostree.yaml
index 01ec2424c..089770f5e 100644
--- a/test/data/ansible/check_ostree.yaml
+++ b/test/data/ansible/check_ostree.yaml
@@ -73,18 +73,31 @@
           set_fact:
             failed_counter: "{{ failed_counter | int + 1 }}"
 
+    # bios or uefi
+    - name: bios or uefi
+      stat:
+        path: /sys/firmware/efi
+      register: result_uefi
+
+    - set_fact:
+        device_name: /dev/vda2
+
+    - set_fact:
+        device_name: /dev/vda3
+      when: result_uefi.stat.exists
+
     # case: check /sysroot moutn point
     - name: check /sysroot mount point
       command: findmnt -r -o SOURCE -n /sysroot
       register: result_sysroot_mount_point
 
-    - name: /sysroot should be mounted on /dev/vda2
+    - name: "/sysroot should be mounted on {{ device_name }}"
       block:
         - assert:
             that:
-              - result_sysroot_mount_point.stdout == "/dev/vda2"
-            fail_msg: "/var does not mount on /dev/vda2"
-            success_msg: "/var mounts on /dev/vda2"
+              - result_sysroot_mount_point.stdout == "{{ device_name }}"
+            fail_msg: "/var does not mount on {{ device_name }}"
+            success_msg: "/var mounts on {{ device_name }}"
       always:
         - set_fact:
             total_counter: "{{ total_counter | int + 1 }}"
@@ -118,13 +131,13 @@
       command: findmnt -r -o SOURCE -n /var
       register: result_var_mount_point
 
-    - name: "/var should be mounted on /dev/vda2[/ostree/deploy/{{ image_type }}/var]"
+    - name: "/var should be mounted on {{ device_name }}[/ostree/deploy/{{ image_type }}/var]"
       block:
         - assert:
             that:
-              - result_var_mount_point.stdout == "/dev/vda2[/ostree/deploy/{{ image_type }}/var]"
-            fail_msg: "/var does not mount on /dev/vda2[/ostree/deploy/{{ image_type }}/var]"
-            success_msg: "/var mounts on /dev/vda2[/ostree/deploy/{{ image_type }}/var]"
+              - result_var_mount_point.stdout == "{{ device_name }}[/ostree/deploy/{{ image_type }}/var]"
+            fail_msg: "/var does not mount on {{ device_name }}[/ostree/deploy/{{ image_type }}/var]"
+            success_msg: "/var mounts on {{ device_name }}[/ostree/deploy/{{ image_type }}/var]"
       always:
         - set_fact:
             total_counter: "{{ total_counter | int + 1 }}"
@@ -158,13 +171,13 @@
       command: findmnt -r -o SOURCE -n /usr
       register: result_usr_mount_point
 
-    - name: "/usr should be mounted on /dev/vda2[/ostree/deploy/{{ image_type }}/deploy/{{ deploy_commit }}.0/usr]"
+    - name: "/usr should be mounted on {{ device_name }}[/ostree/deploy/{{ image_type }}/deploy/{{ deploy_commit }}.0/usr]"
       block:
         - assert:
             that:
-              - result_usr_mount_point.stdout == "/dev/vda2[/ostree/deploy/{{ image_type }}/deploy/{{ deploy_commit }}.0/usr]"
-            fail_msg: "/usr does not mount on /dev/vda2[/ostree/deploy/{{ image_type }}/deploy/{{ deploy_commit }}.0/usr]"
-            success_msg: "/usr mounts on /dev/vda2[/ostree/deploy/{{ image_type }}/deploy/{{ deploy_commit }}.0/usr]"
+              - result_usr_mount_point.stdout == "{{ device_name }}[/ostree/deploy/{{ image_type }}/deploy/{{ deploy_commit }}.0/usr]"
+            fail_msg: "/usr does not mount on {{ device_name }}[/ostree/deploy/{{ image_type }}/deploy/{{ deploy_commit }}.0/usr]"
+            success_msg: "/usr mounts on {{ device_name }}[/ostree/deploy/{{ image_type }}/deploy/{{ deploy_commit }}.0/usr]"
       always:
         - set_fact:
             total_counter: "{{ total_counter | int + 1 }}"