We recently announced [1] that with upcoming FCOS, last major release of Fedora Atomic Host is Fedora 29. This patch (avilable in email attachment) contains changes in bodhi pungi config to build Fedora Atomic related content only till F29. Also, we shouldn't be needing robosignatory signing for Atomic Host rawhide refs.
[1] https://lists.projectatomic.io/projectatomic-archives/atomic-devel/2019-February/msg00004.html
From 085c14eac01f79d7482863f3292e757a73141adb Mon Sep 17 00:00:00 2001 From: Sinny Kumari <[email protected]> Date: Mon, 18 Feb 2019 21:53:08 +0530 Subject: [PATCH] Adjust bodhi pungi config to build AH only for <= F29 Also remove rawhide ref from robosignatory Related: https://github.com/coreos/fedora-coreos-tracker/issues/145 Signed-off-by: Sinny Kumari <[email protected]> --- .../backend/templates/pungi.rpm.conf.j2 | 37 +++++-------------- .../files/robosignatory.production.py | 12 ------ 2 files changed, 9 insertions(+), 40 deletions(-) diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 7777be1e7..7a57b9ba9 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -122,6 +122,9 @@ createiso_skip = [ ostree = { "^Everything$": [ # Atomic Host + # Atomic Host will be avilable till F29 EOL + # See https://github.com/coreos/fedora-coreos-tracker/issues/145 + [% if release.version_int <= 29 %] { "version": "!VERSION_FROM_VERSION_DATE_RESPIN", "force_new_commit": True @@ -130,16 +133,11 @@ ostree = { "config_branch": "f[[ release.version ]]", "repo": [ "Everything", + "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/", [% if request.name == 'testing' %] # In the case of testing, also inject the last stable updates "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/", [% endif %] - # For f30 the compose location is going to be under /compose/branched/ - [% if release.version_int == 30 %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% else %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" - [% endif %] ] "ostree_repo": "/mnt/koji/compose/ostree/repo", [% if request.name == 'stable' %] @@ -151,6 +149,7 @@ ostree = { "arches": ["x86_64", "ppc64le", "aarch64" ], "failable": ["ppc64le", "aarch64"], }, + [% endif %] # Fedora Silverblue { "version": "!VERSION_FROM_VERSION_DATE_RESPIN", @@ -192,7 +191,7 @@ ostree = { } [% endif %] -[% if release.id_prefix == 'FEDORA' and release.version_int >= 29 %] +[% if release.id_prefix == 'FEDORA' and release.version_int == 29 %] global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f[[ release.version_int ]]' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso' @@ -229,13 +228,7 @@ image_build = { 'disk_size': 6, 'target': 'f[[ release.version_int ]]', 'arches': ['x86_64', 'aarch64', 'ppc64le'], - 'install_tree_from': - # For f30 the compose location is going to be under /compose/branched/ - [% if release.version_int == 30 %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/", - [% else %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/", - [% endif %] + 'install_tree_from': 'https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/', 'subvariant': 'AtomicHost', 'failable': ['*'], } @@ -262,13 +255,7 @@ image_build = { 'disk_size': 40, 'target': 'f[[ release.version_int ]]', 'arches': ['x86_64'], - 'install_tree_from': - # For f30 the compose location is going to be under /compose/branched/ - [% if release.version_int == 30 %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/", - [% else %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/", - [% endif %] + 'install_tree_from': 'https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/', 'subvariant': 'AtomicHost', 'failable': ['*'], }, @@ -284,17 +271,11 @@ ostree_installer = [ [% for arch in ['x86_64', 'aarch64', 'ppc64le'] %] '[[ arch ]]': { "repo": [ - "Everything", + "Everything", "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/", [% if request.name == 'testing' %] # In the case of testing, also inject the last stable updates "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/[[arch]]/os/", [% endif %] - # For f30 the compose location is going to be under /compose/branched/ - [% if release.version_int == 30 %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/" - [% else %] - "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/" - [% endif %] ], 'release': None, 'rootfs_size': '4', diff --git a/roles/robosignatory/files/robosignatory.production.py b/roles/robosignatory/files/robosignatory.production.py index 9dd5543e3..c669fa797 100644 --- a/roles/robosignatory/files/robosignatory.production.py +++ b/roles/robosignatory/files/robosignatory.production.py @@ -453,18 +453,6 @@ config = { 'directory': '/mnt/fedora_koji/koji/compose/ostree/repo/', 'key': 'fedora-29' }, - 'fedora/rawhide/x86_64/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/ostree/repo/', - 'key': 'fedora-30' - }, - 'fedora/rawhide/ppc64le/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/ostree/repo/', - 'key': 'fedora-30' - }, - 'fedora/rawhide/aarch64/atomic-host': { - 'directory': '/mnt/fedora_koji/koji/compose/ostree/repo/', - 'key': 'fedora-30' - }, 'fedora/rawhide/x86_64/silverblue': { 'directory': '/mnt/fedora_koji/koji/compose/ostree/repo/', 'key': 'fedora-30' -- 2.20.1
_______________________________________________ infrastructure mailing list -- [email protected] To unsubscribe send an email to [email protected] Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/[email protected]
