diff --git a/fedora.conf b/fedora.conf index af82930..c1822b8 100644 --- a/fedora.conf +++ b/fedora.conf @@ -747,52 +747,32 @@ live_images = [ }), ] -ostree = [ - ("^AtomicHost$", { - "aarch64": { - "version": '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN', - "treefile": "fedora-atomic-host.json", - "config_url": "https://pagure.io/fedora-atomic.git", - "config_branch": "f29", - "repo": "Everything", - "tag_ref": False, - "ostree_repo": "/mnt/koji/compose/atomic/repo/", - 'failable': ['*'], - }, - "x86_64": { - "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "treefile": "fedora-atomic-host.json", - "config_url": "https://pagure.io/fedora-atomic.git", - "config_branch": "f29", - "repo": "Everything", - "tag_ref": False, - "ostree_repo": "/mnt/koji/compose/atomic/repo/", - 'failable': ['*'], - }, - "ppc64le": { - "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "treefile": "fedora-atomic-host.json", - "config_url": "https://pagure.io/fedora-atomic.git", - "config_branch": "f29", - "repo": "Everything", - "tag_ref": False, - "ostree_repo": "/mnt/koji/compose/atomic/repo/", - 'failable': ['*'], - } - }), - ("^Silverblue$", { - "x86_64": { - "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", - "treefile": "fedora-atomic-workstation.json", - "config_url": "https://pagure.io/workstation-ostree-config.git", - "config_branch": "f29", - "repo": "Workstation", - "tag_ref": False, - "ostree_repo": "/mnt/koji/compose/atomic/repo/", - 'failable': ['*'], - } - }) -] +ostree = { + "^AtomicHost$": { + "version": '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN', + "treefile": "fedora-atomic-host.json", + "config_url": "https://pagure.io/fedora-atomic.git", + "config_branch": "f29", + "repo": "Everything", + "tag_ref": False, + "ostree_repo": "/mnt/koji/compose/atomic/repo/", + "ostree_ref": "fedora/29/${basearch}/atomic-host", + "arches": ["aarch64", "ppc64le", "x86_64"], + "failable": ['*'], + }, + "^Silverblue$": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "treefile": "fedora-atomic-workstation.json", + "config_url": "https://pagure.io/workstation-ostree-config.git", + "config_branch": "f29", + "repo": "Workstation", + "tag_ref": False, + "ostree_repo": "/mnt/koji/compose/atomic/repo/", + "ostree_ref": "fedora/29/${basearch}/silverblue", + "arches": ["x86_64"], + "failable": ['*'], + } +} ostree_installer = [ ("^AtomicHost$", {