From 9ea694ef0ae7df3dd6dcf93cfcd7ec297dc5a781 Mon Sep 17 00:00:00 2001
From: yih <yih@redhat.com>
Date: Wed, 7 Sep 2022 20:08:37 +0800
Subject: [PATCH] test: update ansible checks for ostree mount points

---
 test/data/ansible/check_ostree.yaml | 41 +++--------------------------
 1 file changed, 3 insertions(+), 38 deletions(-)

diff --git a/test/data/ansible/check_ostree.yaml b/test/data/ansible/check_ostree.yaml
index 3a5b533f9..3fdf0cdd4 100644
--- a/test/data/ansible/check_ostree.yaml
+++ b/test/data/ansible/check_ostree.yaml
@@ -134,47 +134,12 @@
           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
-
-    # Check if it is raw-image or simplified-installer, the disk are encrypted, and mount point starts with /dev/mapper/luks-
-    - name: check if it is simplified-installer or raw-image
+    - name: set mount point device name
       command: findmnt -r -o SOURCE -n /sysroot
-      register: result_encrypted
+      register: result_sysroot_source
 
     - set_fact:
-        device_name: "{{ result_encrypted.stdout }}"
-      when: "'/dev/mapper/luks-' in result_encrypted.stdout"
-
-    # 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 {{ device_name }}"
-      block:
-        - assert:
-            that:
-              - result_sysroot_mount_point.stdout == "{{ device_name }}"
-            fail_msg: "/sysroot does not mount on {{ device_name }}"
-            success_msg: "/sysroot mounts on {{ device_name }}"
-      always:
-        - set_fact:
-            total_counter: "{{ total_counter | int + 1 }}"
-      rescue:
-        - name: failed count + 1
-          set_fact:
-            failed_counter: "{{ failed_counter | int + 1 }}"
+        device_name: "{{ result_sysroot_source.stdout }}"
 
     # case: check /sysroot mount status
     - name: check /sysroot mount status