[PATCH] bodhi-pungi: specify ostree ref in config and updates for f29

[Dusty Mabe]

Now that we can specify the ostree_ref in the config we can stop
having to choose various fedora-atomic-host-updates-{stable,testing}.json
files.

For silverblue we are also changing the ref to silverblue away from
workstation so we'll only specify ostree_ref if f29+ and let the json
files still specify "workstation" for f27 and f28.
---
 roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 4c436dbb1..a523674e1 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -121,7 +121,7 @@ ostree = {
                 "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
             [% endif %]
             "force_new_commit": True
-            "treefile": "fedora-atomic-host-updates-[[ request.name
]].json",
+            "treefile": "fedora-atomic-host.json",
             "config_url": "https://pagure.io/fedora-atomic.git",
             "config_branch": "f[[ release.version ]]",
             "repo": [
@@ -138,6 +138,11 @@ ostree = {
                 [% endif %]
             ]
             "ostree_repo": "/mnt/koji/compose/atomic/repo",
+            [% if request.name == 'stable' %]
+                "ostree_ref": "fedora/[[ release.version_int
]]/${basearch}/updates/atomic-host",
+            [% else %]
+                "ostree_ref": "fedora/[[ release.version_int
]]/${basearch}/testing/atomic-host",
+            [% endif %]
             "tag_ref": False,
             "arches": ["x86_64",
                        [% if release.version_int >= 27 %]
@@ -154,11 +159,13 @@ ostree = {
             [% if release.version_int >= 28 %]
                 "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
             [% endif %]
-            [% if release.version_int >= 28 %]
+            [% if release.version_int >= 29 %]
+                "treefile": "fedora-silverblue.json",
+            [% elif release.version_int == 28 %]
                 "treefile": "fedora-atomic-workstation-updates-[[
request.name ]].json",
-        [% else %]
+            [% else %]
                 "treefile": "fedora-ostree-workstation-updates-[[
request.name ]].json",
-        [% endif %]
+            [% endif %]
             "config_url":
"https://pagure.io/workstation-ostree-config.git",
             "config_branch": "f[[ release.version ]]",
             "repo": [
@@ -175,6 +182,15 @@ ostree = {
                 [% endif %]
             ]
             "ostree_repo": "/mnt/koji/compose/atomic/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 %]
+            [% endif %]
             "tag_ref": False,
             "arches": ["x86_64"],
             "failable": ["x86_64"]
-- 
2.14.4

[Dusty Mabe]

Forgot to prefix with FBR, please review. This should fix:
https://pagure.io/dusty/failed-composes/issue/714

[Kevin Fenzi]

Does this require a specific version of pungi?

+1 if we have that version installed already...

kevin

[Dusty Mabe]

On 08/29/2018 03:36 PM, Kevin Fenzi wrote:
>  Does this require a specific version of pungi? 
Let's see. It looks like there were two related issues that got fixed:

- https://pagure.io/pungi/issue/777 fixed in 4.1.21
- https://pagure.io/pungi/issue/866 fixed in 4.1.23

so do we have 4.1.23+ installed?

[Mohan Boddu]

bodhi has pungi-4.1.26-2 , so I guess it should be good.

+1

On Wed, Aug 29, 2018 at 3:42 PM Dusty Mabe <dusty(a)dustymabe.com&gt; wrote:

>  On 08/29/2018 03:36 PM, Kevin Fenzi wrote:
>  > Does this require a specific version of pungi?
>
>  Let's see. It looks like there were two related issues that got fixed:
>
>  - https://pagure.io/pungi/issue/777 fixed in 4.1.21
>  - https://pagure.io/pungi/issue/866 fixed in 4.1.23
>
>  so do we have 4.1.23+ installed?
>
>  _______________________________________________
>  infrastructure mailing list -- infrastructure(a)lists.fedoraproject.org
>  To unsubscribe send an email to
>  infrastructure-leave(a)lists.fedoraproject.org
>  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/[e-mail]...
>

[Dusty Mabe]

pushed

On 08/29/2018 03:44 PM, Mohan Boddu wrote:
> bodhi has pungi-4.1.26-2 , so I guess it should be good.
> 
> +1
> 
> On Wed, Aug 29, 2018 at 3:42 PM Dusty Mabe <dusty(a)dustymabe.com
<mailto:[e-mail]>> wrote:
> 
> 
> 
>     On 08/29/2018 03:36 PM, Kevin Fenzi wrote:
>     > Does this require a specific version of pungi?
> 
>     Let's see. It looks like there were two related issues that got fixed:
> 
>     - https://pagure.io/pungi/issue/777 fixed in 4.1.21
>     - https://pagure.io/pungi/issue/866 fixed in 4.1.23
> 
>     so do we have 4.1.23+ installed?
> 
>     _______________________________________________
>     infrastructure mailing list -- infrastructure(a)lists.fedoraproject.org
<mailto:[e-mail]>
>     To unsubscribe send an email to infrastructure-leave(a)lists.fedoraproject.org
<mailto:[e-mail]>
>     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/[e-mail]...
> 
> 
> 
> _______________________________________________
> infrastructure mailing list -- infrastructure(a)lists.fedoraproject.org
> To unsubscribe send an email to infrastructure-leave(a)lists.fedoraproject.org
> 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/[e-mail]...
>

[Randy Barlow]

On 08/29/2018 03:41 PM, Dusty Mabe wrote:
>  On 08/29/2018 03:36 PM, Kevin Fenzi wrote:
> > Does this require a specific version of pungi?
>  
>  Let's see. It looks like there were two related issues that got fixed:
>  
>  - https://pagure.io/pungi/issue/777 fixed in 4.1.21
>  - https://pagure.io/pungi/issue/866 fixed in 4.1.23
>  
>  so do we have 4.1.23+ installed?  
[bowlofeggs@bodhi-backend01 ~][PROD]$ rpm -q pungi
pungi-4.1.26-2.fc27.noarch

[Kevin Fenzi]

On 08/29/2018 12:41 PM, Dusty Mabe wrote:
>  
>  
>  On 08/29/2018 03:36 PM, Kevin Fenzi wrote:
> > Does this require a specific version of pungi?
>  
>  Let's see. It looks like there were two related issues that got fixed:
>  
>  - https://pagure.io/pungi/issue/777 fixed in 4.1.21
>  - https://pagure.io/pungi/issue/866 fixed in 4.1.23
>  
>  so do we have 4.1.23+ installed?  

pungi-4.1.26-2.fc27.noarch

so, cool.

kevin