PR#1019: Prepare for f34 Beta RC2 - pungi-fedora

pungi-fedora

#1019 Prepare for f34 Beta RC2

Merged 3 years ago by mohanboddu. Opened 3 years ago by kevin.

Unknown source f34b-rc2 into f34

Prepare for f34 Beta RC2

Kevin Fenzi • 3 years ago

108f175

fedora-beta.conf

file modified

+2 -2

		`@@ -303,7 +303,7 @@`

		`# These will be inherited by live_media, live_images and image_build`
		`global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f34'`
		`- global_release = '1.1'`
		`+ global_release = '1.2'`
		`global_version = '34_Beta'`
		`# live_images ignores this in favor of live_target`
		`global_target = 'f34'`
		`@@ -763,7 +763,7 @@`
		`# 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/f34 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.clocks/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.FileRoller/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.gedit/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.gnome.Screenshot/x86_64/stable app/org.gnome.Weather/x86_64/stable",
		+ "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f33 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.clocks/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.FileRoller/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.gedit/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.gnome.Screenshot/x86_64/stable app/org.gnome.Weather/x86_64/stable",
		`],`
		`'template_repo': 'https://pagure.io/fedora-lorax-templates.git',`
		`'template_branch': 'f34',`

kevin commented 3 years ago

Flatpaks are still using f33 as the platform, there's no f34 one.
Change from 1.1 to 1.2 in global_version

Signed-off-by: Kevin Fenzi kevin@scrye.com

kalev commented 3 years ago

+1 for the flatpak change.

adamwill commented 3 years ago

i guess technically the flatpak change requires an FE, but I won't tell if no-one else does

kevin commented 3 years ago

Yeah, I suppose, but it's a weird thing... since we didn't get a FE to land the entire conf file that made the rc 1.1 compose. ;) Or need to accept the change to 1.2 for RC2...

But yeah, if we need to, great we can. If not, fine too. :)

adamwill commented 3 years ago

let's just go ahead and merge it. i want to do an RC2 tonight and we should fix this.