From c13ef03960375050da82247e336d2f0f32836a82 Mon Sep 17 00:00:00 2001
From: lnie <lnie@redhat.com>
Date: Sep 26 2020 03:41:06 +0000
Subject: fix an error


---

diff --git a/fedora_release_autotest/conf_test_cases.py b/fedora_release_autotest/conf_test_cases.py
index 31fe0c2..e3d0a8d 100644
--- a/fedora_release_autotest/conf_test_cases.py
+++ b/fedora_release_autotest/conf_test_cases.py
@@ -86,6 +86,7 @@ Ks_List = [
         "ks_meta": "no_autopart",
         "ks_append": """
                      part /boot --fstype="xfs"  --size=1024
+                     part /boot/efi --fstype="xfs"  --size=1024
                      part btrfs.355 --fstype="btrfs"  --size=15360
                      btrfs none --label=fedora_fedora00 btrfs.355
                      btrfs / --subvol --name=root LABEL=fedora_fedora00
@@ -96,6 +97,7 @@ Ks_List = [
         "ks_meta": "no_autopart",
         "ks_append": """
                      part /boot --fstype="xfs"  --size=1024
+                     part /boot/efi --fstype="xfs"  --size=1024
                      part btrfs.355 --fstype="btrfs"  --size=15360
                      btrfs none --label=fedora_fedora00 btrfs.355
                      btrfs / --subvol --name=root LABEL=fedora_fedora00
@@ -128,7 +130,8 @@ Ks_List = [
         "device_description": "UEFI",
         "ks_meta": "no_autopart",
         "ks_append": """
-                     part /boot --fstype=xfs
+                     part /boot --fstype=xfs --size=1024
+                     part /boot/efi --fstype="xfs"  --size=1024
                      part / --fstype=ext3 --grow
                      """
         }},
@@ -136,7 +139,8 @@ Ks_List = [
         "cpu-arch": "aarch64",
         "ks_meta": "no_autopart",
         "ks_append": """
-                     part /boot --fstype=xfs
+                     part /boot --fstype=xfs --size=1024
+                     part /boot/efi --fstype="xfs"  --size=1024
                      part / --fstype=ext3 --grow
                      """
         }},
@@ -152,7 +156,8 @@ Ks_List = [
         "device_description": "UEFI",
         "ks_meta": "no_autopart",
         "ks_append": """
-                     part /boot --fstype=xfs
+                     part /boot --fstype=xfs --size=1024
+                     part /boot/efi --fstype="xfs"  --size=1024
                      part / --fstype=xfs --grow
                      """
         }},
@@ -160,7 +165,8 @@ Ks_List = [
         "cpu-arch": "aarch64",
         "ks_meta": "no_autopart",
         "ks_append": """
-                     part /boot --fstype=xfs
+                     part /boot --fstype=xfs --size=1024
+                     part /boot/efi --fstype="xfs"  --size=1024
                      part / --fstype=xfs --grow
                      """
         }},
diff --git a/fedora_release_autotest/convertor.py b/fedora_release_autotest/convertor.py
index 68276a2..51a63e7 100644
--- a/fedora_release_autotest/convertor.py
+++ b/fedora_release_autotest/convertor.py
@@ -323,7 +323,7 @@ def add_reserve_task(recipe: Element, sanitized_query: dict):
     Use a reserve task to reserve a machine.
     """
     task = etree.SubElement(recipe, 'task')
-    task.set('name', '/distribution/dummy')
+    task.set('name', '/distribution/check-install')
     task.set('role', 'STANDALONE')
     task_params = etree.SubElement(task, 'params')
     task_param = etree.SubElement(task_params, 'param')
@@ -335,11 +335,12 @@ def add_reserve_task(recipe: Element, sanitized_query: dict):
     task.set('role', 'STANDALONE')
     task_params = etree.SubElement(task, 'params')
     task_param = etree.SubElement(task_params, 'param')
+    task_param2 = etree.SubElement(task_params, 'param')
     task_param.set('name', 'RSTRNT_DISABLED')
     task_param.set('value', '01_dmesg_check 10_avc_check')
     reserve_time = sanitized_query.get('provision-lifespan', 7200)
-    task_param.set('name', 'RESERVETIME')
-    task_param.set('value', str(reserve_time))
+    task_param2.set('name', 'RESERVETIME')
+    task_param2.set('value', str(reserve_time))
 
     sanitized_query['lifespan'] = reserve_time
     if sanitized_query["ts_name"] == "QA:Testcase_Install_to_Previous_KVM":
diff --git a/fedora_release_autotest/utils.py b/fedora_release_autotest/utils.py
index ccf23d9..97d2ecb 100644
--- a/fedora_release_autotest/utils.py
+++ b/fedora_release_autotest/utils.py
@@ -14,6 +14,7 @@ def wiki_report(data, result):
     bootmethod = 'x86_64 BIOS'
     section = ''
     env = ''
+    arch = data.get('cpu-arch') or 'x86_64'
     subvariant = data.get('beaker-distro_variant') or 'Server'
     if data.get('device_description') == 'BIOS':
         bootmethod = 'x86_64 BIOS'
@@ -30,6 +31,7 @@ def wiki_report(data, result):
                 changed = {}
                 for k, v in value.items():
                     v = v.replace('$FIRMWARE$', firmware)
+                    v = v.replace('$RUNARCH$', arch)
                     v = v.replace('$BOOTMETHOD$', bootmethod)
                     v = v.replace('$SUBVARIANT$', subvariant)
                     v = v.replace('$IMAGETYPE$', imagetype)