A few patches for bodhi pungi compose

[Dusty Mabe]

[PATCH 1/3] bodhi-pungi: get rid of < f29 logic

Some cleanup

[PATCH 2/3] bodhi-pungi: branched is now f31

This fixes a compose issue: 
https://pagure.io/releng/failed-composes/issue/53

[PATCH 3/3] bodhi-pungi: add the f32 signing key

Future proofing.

[PATCH 1/3] bodhi-pungi: get rid of < f29 logic

[Dusty Mabe]

We are no longer building f28 so we can remove these if statements.
---
 .../bodhi2/backend/templates/pungi.rpm.conf.j2 | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 93638c4ef..477fe14da 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -168,11 +168,7 @@ ostree = {
         # Fedora Silverblue
         {
             "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
-            [% if release.version_int >= 29 %]
-                "treefile": "fedora-silverblue.yaml",
-            [% else %]
-                "treefile": "fedora-atomic-workstation-updates-[[ request.name ]].json",
-            [% endif %]
+            "treefile": "fedora-silverblue.yaml",
             "config_url": "https://pagure.io/workstation-ostree-config.git",
             "config_branch": "f[[ release.version ]]",
             "repo": [
@@ -189,14 +185,10 @@ ostree = {
                 [% endif %]
             ]
             "ostree_repo": "/mnt/koji/compose/ostree/repo",
-            # For f29+ we are changing the ref to silverblue. For f28/f27 let the files
-            # still specify the workstation ref.
-            [% if release.version_int >= 29 %]
-                [% if request.name == 'stable' %]
-                    "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/silverblue",
-                [% else %]
-                    "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/silverblue",
-                [% endif %]
+            [% if request.name == 'stable' %]
+                "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/silverblue",
+            [% else %]
+                "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/silverblue",
             [% endif %]
             "tag_ref": False,
             "arches": ["x86_64"],

[PATCH 2/3] bodhi-pungi: branched is now f31

[Dusty Mabe]

Update the location so that our f30 updates composes work again.
---
 roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 477fe14da..bd8ec6526 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -177,8 +177,8 @@ ostree = {
                     # In the case of testing, also inject the last stable updates
                     "https://kojipkgs%7B%7B 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 %]
+                # For f31 the compose location is going to be under /compose/branched/
+                [% if release.version_int == 31 %]
                     "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"
                 [% else %]
                     "https://kojipkgs%7B%7B env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"

[PATCH 3/3] bodhi-pungi: add the f32 signing key

[Dusty Mabe]

---
 roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index bd8ec6526..688badeee 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -31,6 +31,8 @@ sigkeys = [
     'cfc659b9',
 [% elif release.version_int == 31 %]
     '3c3359c4',
+[% elif release.version_int == 32 %]
+    '12c944d0',
 [% elif release.version_int == 6 %]
     '0608b895',
 [% elif release.version_int == 7 %]

[Kevin Fenzi]

On 8/23/19 5:07 AM, Dusty Mabe wrote:
> [PATCH 1/3] bodhi-pungi: get rid of < f29 logic
>
> Some cleanup
>
> [PATCH 2/3] bodhi-pungi: branched is now f31
>
> This fixes a compose issue: 
> https://pagure.io/releng/failed-composes/issue/53
>
> [PATCH 3/3] bodhi-pungi: add the f32 signing key
>
> Future proofing.

Sure, looks ok to me. +1 to merge and I can run the playbook if you like.

kevin

[Dusty Mabe]

On 8/23/19 12:19 PM, Kevin Fenzi wrote:
> On 8/23/19 5:07 AM, Dusty Mabe wrote:
> > [PATCH 1/3] bodhi-pungi: get rid of < f29 logic
> >
> > Some cleanup
> >
> > [PATCH 2/3] bodhi-pungi: branched is now f31
> >
> > This fixes a compose issue: 
> > https://pagure.io/releng/failed-composes/issue/53
> >
> > [PATCH 3/3] bodhi-pungi: add the f32 signing key
> >
> > Future proofing.
>
> Sure, looks ok to me. +1 to merge and I can run the playbook if you like.

Pushed and playbook ran! That's one button I'm able to push!

Dusty