Now that pungi has been updated on the bodhi backend machines (https://pagure.io/fedora-infrastructure/issue/7484) I can re-enable updates-testing for silverblue. Also added some removal of code specific to f27.
- bodhi-pungi: re-enable testing ostree for silverblue - bodhi-pungi: simplify now that f27 is EOL
This re-enables updates-testing composes for silverblue that were stopped in df5009d because of https://pagure.io/pungi/issue/1092 --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 2 -- 1 file changed, 2 deletions(-)
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 7a061b5b0..f2f058771 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -160,7 +160,6 @@ ostree = { [% endif %] }, # Fedora Silverblue - [% if request.name == 'stable' %] { [% if release.version_int >= 28 %] "version": "!VERSION_FROM_VERSION_DATE_RESPIN", @@ -201,7 +200,6 @@ ostree = { "arches": ["x86_64"], "failable": ["x86_64"] }, - [% endif %] ] } [% endif %]
Removes conditional logic that considers f27. --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index f2f058771..4757153fd 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -118,14 +118,12 @@ createiso_skip = [ ]
{% if env != "staging" %} -[% if release.id_prefix == 'FEDORA' and release.version_int >= 26 %] +[% if release.id_prefix == 'FEDORA' %] ostree = { "^Everything$": [ # Atomic Host { - [% if release.version_int >= 28 %] - "version": "!VERSION_FROM_VERSION_DATE_RESPIN", - [% endif %] + "version": "!VERSION_FROM_VERSION_DATE_RESPIN", "force_new_commit": True "treefile": "fedora-atomic-host.json", "config_url": "https://pagure.io/fedora-atomic.git", @@ -150,26 +148,17 @@ ostree = { "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/atomic-host", [% endif %] "tag_ref": False, - "arches": ["x86_64", - [% if release.version_int >= 27 %] - "ppc64le", "aarch64" - [% endif %] - ], - [% if release.version_int >= 27 %] - "failable": ["ppc64le", "aarch64"], + "arches": ["x86_64", "ppc64le", "aarch64" ], + "failable": ["ppc64le", "aarch64"], [% endif %] }, # Fedora Silverblue { - [% if release.version_int >= 28 %] - "version": "!VERSION_FROM_VERSION_DATE_RESPIN", - [% endif %] + "version": "!VERSION_FROM_VERSION_DATE_RESPIN", [% if release.version_int >= 29 %] "treefile": "fedora-silverblue.yaml", - [% elif release.version_int == 28 %] - "treefile": "fedora-atomic-workstation-updates-[[ request.name ]].json", [% else %] - "treefile": "fedora-ostree-workstation-updates-[[ request.name ]].json", + "treefile": "fedora-atomic-workstation-updates-[[ request.name ]].json", [% endif %] "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f[[ release.version ]]",
Looks fine to me. +1
If you can get it in before tonights push that would be great.
kevin
infrastructure@lists.fedoraproject.org
-
Dusty Mabe -
Kevin Fenzi