From 272fcf616e1e3ca9f350c0e97493f5350f63915c Mon Sep 17 00:00:00 2001
From: lnie <lnie@redhat.com>
Date: Feb 20 2021 09:18:19 +0000
Subject: handle branched urls correctly


---

diff --git a/fedora_release_autotest/conf_test_cases.py b/fedora_release_autotest/conf_test_cases.py
index d741cae..38f704e 100644
--- a/fedora_release_autotest/conf_test_cases.py
+++ b/fedora_release_autotest/conf_test_cases.py
@@ -42,60 +42,6 @@ Ks_List = [
         "beaker-distro_variant": "Everything",
         "boot_description": "BIOS",
         }},
-    { "QA:Testcase_arm_image_deployment": {
-        "beaker-distro_variant": "Server",
-        "cpu-arch": "aarch64",
-        "vm_hw": "HW",
-        }},
-    { "QA:Testcase_arm_image_deployment": {
-        "beaker-distro_variant": "Everything",
-        "real-distro_variant": "Minimal",
-        "cpu-arch": "aarch64",
-        "vm_hw": "HW",
-        "ks_append": """
-                     %packages
-                     @^minimal-environment
-                     %end
-                     """
-        }},
-    { "QA:Testcase_arm_image_deployment": {
-        "beaker-distro_variant": "Everything",
-        "real-distro_variant": "Workstation",
-        "cpu-arch": "aarch64",
-        "vm_hw": "HW",
-        "ks_append": """
-                     %packages
-                     @^workstation-product-environment
-                     %end
-                     """
-        }},
-    { "QA:Testcase_arm_image_deployment": {
-        "beaker-distro_variant": "Server",
-        "cpu-arch": "aarch64",
-        "vm_hw": "VM",
-        }},
-    { "QA:Testcase_arm_image_deployment": {
-        "beaker-distro_variant": "Everything",
-        "real-distro_variant": "Minimal",
-        "cpu-arch": "aarch64",
-        "vm_hw": "VM",
-        "ks_append": """
-                     %packages
-                     @^minimal-environment
-                     %end
-                     """
-        }},
-    { "QA:Testcase_arm_image_deployment": {
-        "beaker-distro_variant": "Everything",
-        "real-distro_variant": "Workstation",
-        "cpu-arch": "aarch64",
-        "vm_hw": "VM",
-        "ks_append": """
-                     %packages
-                     @^workstation-product-environment
-                     %end
-                     """
-        }},
     {"QA:Testcase_Boot_Methods_Pxeboot": {
         "cpu-arch": "x86_64",
         }},
diff --git a/fedora_release_autotest/consumer.py b/fedora_release_autotest/consumer.py
index 09d665a..f11a11b 100644
--- a/fedora_release_autotest/consumer.py
+++ b/fedora_release_autotest/consumer.py
@@ -77,6 +77,8 @@ def populate_data(data):
     arch = data["cpu-arch"]
     base_http_url_rawhide = "http://download.eng.brq.redhat.com/pub/fedora/fedmsg/dumpdata/"
     base_nfs_url_rawhide = "nfs://ntap-brq2-c01-eng01-nfs-a.storage.eng.brq2.redhat.com:/pub/fedora/fedmsg/dumpdata/"
+    base_http_url_branch = "http://download.eng.brq.redhat.com/pub/fedora/fedmsg/dumpdata/"
+    base_nfs_url_branch = "nfs://ntap-brq2-c01-eng01-nfs-a.storage.eng.brq2.redhat.com:/pub/fedora/fedmsg/dumpdata/"
     base_released_url = "http://download.eng.bos.redhat.com/released/fedora"
     base_url = "https://kojipkgs.fedoraproject.org/compose/branched/"
     release_str = re.split('-', data["beaker-distro"])[1]
@@ -93,6 +95,8 @@ def populate_data(data):
         base_url = "https://kojipkgs.fedoraproject.org/compose/branched/"
         download_url = os.path.join(base_url, data["beaker-distro"], "compose/Server", data["cpu-arch"],
                 "iso", "Fedora-Server-dvd-%s-%s-%s.iso")%(arch, release_str, compose_name)
+        http_url = os.path.join(base_http_url_branch, data["beaker-distro"], "Server", data["cpu-arch"], "os")
+        nfs_url = os.path.join(base_nfs_url_branch, data["beaker-distro"], "Server", data["cpu-arch"], "os")
     for ks_data in ks_list:
         (ts_name , params), = ks_data.items()
         temp = copy.deepcopy(data)