diff --git a/pyanaconda/modules/payloads/payload/factory.py b/pyanaconda/modules/payloads/payload/factory.py index 715b9d3f041..c32c9ebd311 100644 --- a/pyanaconda/modules/payloads/payload/factory.py +++ b/pyanaconda/modules/payloads/payload/factory.py @@ -58,6 +58,9 @@ def get_type_for_kickstart(cls, data): :param data: a kickstart data :return: a payload type """ + if data.ostreesetup.seen: + return PayloadType.RPM_OSTREE + if data.liveimg.seen: return PayloadType.LIVE_IMAGE @@ -69,7 +72,4 @@ def get_type_for_kickstart(cls, data): data.packages.seen: return PayloadType.DNF - if data.ostreesetup.seen: - return PayloadType.RPM_OSTREE - return None diff --git a/tests/nosetests/pyanaconda_tests/module_payload_rpm_ostree_test.py b/tests/nosetests/pyanaconda_tests/module_payload_rpm_ostree_test.py index 4b200f2a780..f25ff3b48f6 100644 --- a/tests/nosetests/pyanaconda_tests/module_payload_rpm_ostree_test.py +++ b/tests/nosetests/pyanaconda_tests/module_payload_rpm_ostree_test.py @@ -86,3 +86,15 @@ def ostree_kickstart_test(self): """ self.shared_ks_tests.check_kickstart(ks_in, ks_out) self._check_properties(SOURCE_TYPE_RPM_OSTREE) + + def priority_kickstart_test(self): + ks_in = """ + ostreesetup --osname="fedora-iot" --url="https://compose/iot/" --ref="fedora/iot" + url --url="https://compose/Everything" + """ + ks_out = """ + # OSTree setup + ostreesetup --osname="fedora-iot" --remote="fedora-iot" --url="https://compose/iot/" --ref="fedora/iot" + """ + self.shared_ks_tests.check_kickstart(ks_in, ks_out) + self._check_properties(SOURCE_TYPE_RPM_OSTREE)