pungi-fedora

Clone

#1208 Switch to F39 flatpak runtime for Silverblue (F38)
Merged 8 months ago by sgallagh. Opened 8 months ago by adamwill.
adamwill/pungi-fedora f39-runtime-f38  into  f38

file modified
+4 -2 
@@ -913,7 +913,8 @@ 
 

                  # using registry-no-cdn avoids redirects to the CDN;
 

                  # needed because of network restrictions on koji runroot
 

                  "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
 

-                 "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f38 app/org.gnome.baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.Cheese/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Connections/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.Extensions/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.TextEditor/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.fedoraproject.MediaWriter/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Weather/x86_64/stable",
 

+                 # keeping them on the stable release until the flatpak sig confirms the next update
 

+                 "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f39 app/org.gnome.baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.Cheese/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Connections/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.Extensions/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.TextEditor/x86_64/stable app/org.gnome.Loupe/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.fedoraproject.MediaWriter/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Weather/x86_64/stable",
 

              ],
 

              'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
 

              'template_branch': 'f38',
 
@@ -966,7 +967,8 @@ 
 

                  # using registry-no-cdn avoids redirects to the CDN;
 

                  # needed because of network restrictions on koji runroot
 

                  "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
 

-                 "flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f38 app/org.gnome.baobab/aarch64/stable app/org.gnome.Calculator/aarch64/stable app/org.gnome.Calendar/aarch64/stable app/org.gnome.Characters/aarch64/stable app/org.gnome.Cheese/aarch64/stable app/org.gnome.clocks/aarch64/stable app/org.gnome.Connections/aarch64/stable app/org.gnome.Contacts/aarch64/stable app/org.gnome.eog/aarch64/stable app/org.gnome.Evince/aarch64/stable app/org.gnome.Extensions/aarch64/stable app/org.gnome.font-viewer/aarch64/stable app/org.gnome.TextEditor/aarch64/stable app/org.gnome.Logs/aarch64/stable app/org.gnome.Maps/aarch64/stable app/org.fedoraproject.MediaWriter/aarch64/stable app/org.gnome.NautilusPreviewer/aarch64/stable app/org.gnome.Weather/aarch64/stable",
 

+                 # keeping them on the stable release until the flatpak sig confirms the next update
 

+                 "flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f39 app/org.gnome.baobab/aarch64/stable app/org.gnome.Calculator/aarch64/stable app/org.gnome.Calendar/aarch64/stable app/org.gnome.Characters/aarch64/stable app/org.gnome.Cheese/aarch64/stable app/org.gnome.clocks/aarch64/stable app/org.gnome.Connections/aarch64/stable app/org.gnome.Contacts/aarch64/stable app/org.gnome.Evince/aarch64/stable app/org.gnome.Extensions/aarch64/stable app/org.gnome.font-viewer/aarch64/stable app/org.gnome.TextEditor/aarch64/stable app/org.gnome.Loupe/aarch64/stable app/org.gnome.Logs/aarch64/stable app/org.gnome.Maps/aarch64/stable app/org.fedoraproject.MediaWriter/aarch64/stable app/org.gnome.NautilusPreviewer/aarch64/stable app/org.gnome.Weather/aarch64/stable",
 

              ],
 

              'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
 

              'template_branch': 'f38',

At the same time, replace eog with loupe to match default app changes in
Workstation.

Signed-off-by: Kalev Lember klember@redhat.com

This is https://pagure.io/pungi-fedora/pull-request/1202 for the f38 branch. It's appropriate on all branches because we don't separate the flatpaks and runtimes themselves by release branch - the runtime and flatpaks we support now are these ones. Anyone wanting to build a new F38 ostree Silverblue installer image, for some reason (ahem, openQA) should pull in these bits.

gonna give @kevin and @kalev an hour or two to check this if they're around, but then i'm gonna merge, because openQA tests fail without this (and I don't really want to hack it up on the test side).

well, no, I'm not, because I don't have commit rights here. :P I thought I did...

Pull-Request has been merged by sgallagh
8 months ago

Thanks, @adamwill! I totally forgot that this is needed for F37 and F38 as well.
Metadata
None
No Tags
Changes Summary 1
+4 -2
file changed
fedora.conf
Powered by Pagure 5.14.1
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.