PR#68: Branch Fedora 41 from Rawhide - fedora-kiwi-descriptions

fedora-kiwi-descriptions

#68 Branch Fedora 41 from Rawhide

Merged 2 months ago by jnsamyak. Opened 2 months ago by jnsamyak.

jnsamyak/fedora-kiwi-descriptions f41 into f41

Branch Fedora 41 from Rawhide

Samyak Jain • 2 months ago

8203a65

Fedora.kiwi

file modified

+2 -2

		`@@ -7,12 +7,12 @@`
		`<specification>Fedora Linux</specification>`
		`</description>`
		`<preferences>`
		`- <version>Rawhide</version>`
		`+ <version>41</version>`
		`<packagemanager>dnf5</packagemanager>`
		`<locale>en_US</locale>`
		`<keytable>us</keytable>`
		`<timezone>UTC</timezone>`
		`- <release-version>rawhide</release-version>`
		`+ <release-version>41</release-version>`
		`</preferences>`
		`<include from="this://./repositories/core.xml"/>`
		`<include from="this://./components/boot.xml"/>`

README.md

file modified

+1 -1

		`@@ -2,7 +2,7 @@`

		`This project is used to manage the Fedora KIWI image descriptions used in composing Fedora release images.`

		- The `rawhide` branch is used for Fedora Rawhide images and each release branch is used by that release.
		+ The `41` branch is used for Fedora 41 images.

		`All changes should be made via the PR workflow.`

repositories/core.xml

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- core-rawhide.xml`
		`\ No newline at end of file`
		`+ core-nonrawhide.xml`
		`\ No newline at end of file`

teams/cloud/container.xml

file modified

+12 -12

		`@@ -17,7 +17,7 @@`
		`<type image="oci">`
		`<containerconfig`
		`name="fedora"`
		`- tag="rawhide"`
		`+ tag="41"`
		`maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>"`
		`>`
		`<subcommand execute="/bin/bash"/>`
		`@@ -26,12 +26,12 @@`
		`<label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/>`
		`<label name="org.opencontainers.image.license" value="MIT"/>`
		`<label name="org.opencontainers.image.name" value="fedora"/>`
		`- <label name="org.opencontainers.image.version" value="rawhide"/>`
		`+ <label name="org.opencontainers.image.version" value="41"/>`
		`<!-- Legacy attributes for backward compatibility -->`
		`<label name="vendor" value="Fedora Project"/>`
		`<label name="license" value="MIT"/>`
		`<label name="name" value="fedora"/>`
		`- <label name="version" value="rawhide"/>`
		`+ <label name="version" value="41"/>`
		`</labels>`
		`<environment>`
		`<env name="container" value="oci"/>`
		`@@ -47,7 +47,7 @@`
		`<type image="oci">`
		`<containerconfig`
		`name="fedora-minimal"`
		`- tag="rawhide"`
		`+ tag="41"`
		`maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>"`
		`>`
		`<subcommand execute="/bin/bash"/>`
		`@@ -56,12 +56,12 @@`
		`<label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/>`
		`<label name="org.opencontainers.image.license" value="MIT"/>`
		`<label name="org.opencontainers.image.name" value="fedora-minimal"/>`
		`- <label name="org.opencontainers.image.version" value="rawhide"/>`
		`+ <label name="org.opencontainers.image.version" value="41"/>`
		`<!-- Legacy attributes for backward compatibility -->`
		`<label name="vendor" value="Fedora Project"/>`
		`<label name="license" value="MIT"/>`
		`<label name="name" value="fedora-minimal"/>`
		`- <label name="version" value="rawhide"/>`
		`+ <label name="version" value="41"/>`
		`</labels>`
		`<environment>`
		`<env name="container" value="oci"/>`
		`@@ -77,7 +77,7 @@`
		`<type image="oci">`
		`<containerconfig`
		`name="fedora-init"`
		`- tag="rawhide"`
		`+ tag="41"`
		`maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>"`
		`>`
		`<subcommand execute="/sbin/init"/>`
		`@@ -86,12 +86,12 @@`
		`<label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/>`
		`<label name="org.opencontainers.image.license" value="MIT"/>`
		`<label name="org.opencontainers.image.name" value="fedora-init"/>`
		`- <label name="org.opencontainers.image.version" value="rawhide"/>`
		`+ <label name="org.opencontainers.image.version" value="41"/>`
		`<!-- Legacy attributes for backward compatibility -->`
		`<label name="vendor" value="Fedora Project"/>`
		`<label name="license" value="MIT"/>`
		`<label name="name" value="fedora-init"/>`
		`- <label name="version" value="rawhide"/>`
		`+ <label name="version" value="41"/>`
		`</labels>`
		`<stopsignal>SIGRTMIN+3</stopsignal>`
		`</containerconfig>`
		`@@ -105,7 +105,7 @@`
		`<type image="oci">`
		`<containerconfig`
		`name="fedora-toolbox"`
		`- tag="rawhide"`
		`+ tag="41"`
		`maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>"`
		`>`
		`<subcommand execute="/bin/bash"/>`
		`@@ -114,13 +114,13 @@`
		`<label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/>`
		`<label name="org.opencontainers.image.license" value="MIT"/>`
		`<label name="org.opencontainers.image.name" value="fedora-toolbox"/>`
		`- <label name="org.opencontainers.image.version" value="rawhide"/>`
		`+ <label name="org.opencontainers.image.version" value="41"/>`
		`<label name="com.github.containers.toolbox" value="true"/>`
		`<!-- Legacy attributes for backward compatibility -->`
		`<label name="vendor" value="Fedora Project"/>`
		`<label name="license" value="MIT"/>`
		`<label name="name" value="fedora-toolbox"/>`
		`- <label name="version" value="rawhide"/>`
		`+ <label name="version" value="41"/>`
		`</labels>`
		`<environment>`
		`<env name="container" value="oci"/>`

jnsamyak commented 2 months ago

This should not be merged before August 13;

But @ngompa, can you review it please, and see if I missing things can you let me know or can you please also review pungi-fedora pr for 41 to see if Kiwi changes are correct? https://pagure.io/pungi-fedora/pull-request/1310

Signed-off-by: Samyak Jain samyak.jn11@gmail.com

zuul commented 2 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/18eb9a8702a34030ac23079f930435d4

build-images-x86_64 : FAILURE in 13m 41s
build-images-aarch64 : FAILURE in 10m 30s

ngompa commented on line 6 of README.md 2 months ago

The second half of this sentence should be dropped.

ngompa commented 2 months ago

.zuul.yaml should not be changed.

ngompa commented 2 months ago

repositories/core-rawhide.xml should not be changed, instead the repositories/core.xml symlink should be updated to point to repositories/core-nonrawide.xml file instead.

ngompa commented 2 months ago

You can see what branching looked like when we did it for f40 here: https://pagure.io/fedora-kiwi-descriptions/c/444a25db83e60d881c81971ebe9b1e17083f6f0f?branch=f40

jnsamyak commented 2 months ago

Thanks, I'll check and update it, one more thing, Are any changes required for the rawhide, It tried grepping if we are using something like a specific tags (41 currently) but couldn't find anything there

ngompa commented 2 months ago

Nope. The rawhide branch should be fine as-is.

rebased onto b77585e

2 months ago

jnsamyak commented 2 months ago

@ngompa, thanks for the review changes are made!

jnsamyak commented 2 months ago

can i just create symlink, while removing the core.xml and running ln -s core-nonrawhide.xml core.xml on it?

ngompa commented 2 months ago

You can. You can force the symlink to be updated in one step with ln -sf core-nonrawhide.xml core.xml

ngompa commented 2 months ago

Looks like you accidentally blew away core-rawhide.xml?