fedora-kiwi-descriptions

Clone
Source Code
GIT

#46 Adjust configs for SwitchToDnf5 Change
Merged 23 days ago by adamwill. Opened a month ago by adamwill.
adamwill/fedora-kiwi-descriptions dnf5  into  rawhide

file modified
+1 -1 
@@ -8,7 +8,7 @@ 
 

  	</description>
 

  	<preferences>
 

  		<version>Rawhide</version>
 

- 		<packagemanager>dnf</packagemanager>
 

+ 		<packagemanager>dnf5</packagemanager>
 

  		<locale>en_US</locale>
 

  		<keytable>us</keytable>
 

  		<timezone>UTC</timezone>

file modified
+4 -6 
@@ -130,7 +130,7 @@ 
 

  		<ignore name="glibc-langpack-en"/>
 

  		<ignore name="langpacks-en"/>
 

  		<ignore name="tzdata"/>
 

- 		<package name="microdnf"/>
 

+ 		<package name="dnf5"/>
 

  		<package name="glibc-minimal-langpack"/>
 

  	</packages>
 

  	<packages type="bootstrap" profiles="Container-Base-Generic">
 
@@ -142,8 +142,7 @@ 
 

  		<package name="rootfiles"/>
 

  		<package name="tar"/> <!-- https://bugzilla.redhat.com/show_bug.cgi?id=1409920 -->
 

  		<package name="vim-minimal"/>
 

- 		<package name="dnf"/>
 

- 		<package name="dnf-yum"/> <!-- https://pagure.io/fesco/issue/1312#comment-30991 -->
 

+ 		<package name="dnf5"/>
 

  		<package name="glibc-minimal-langpack"/>
 

  		<package name="tzdata"/>
 

  		<package name="xz"/>
 
@@ -178,9 +177,8 @@ 
 

  		<package name="curl"/>
 

  		<package name="default-editor"/>
 

  		<package name="diffutils"/>
 

- 		<package name="dnf"/>
 

- 		<package name="dnf-yum"/> <!-- https://pagure.io/fesco/issue/1312#comment-30991 -->
 

- 		<package name="dnf-plugins-core"/>
 

+ 		<package name="dnf5"/>
 

+ 		<package name="dnf5-plugins"/>
 

  		<package name="fedora-release-toolbx"/>
 

  		<package name="file"/>
 

  		<package name="findutils"/>

file modified
-1 
@@ -58,7 +58,6 @@ 
 

  		<user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/>
 

  	</users>
 

  	<packages type="image" patternType="plusRecommended" profiles="VagrantCore">
 

- 		<package name="dnf-yum"/>
 

  		<package name="rsync"/>
 

  		<package name="fuse-sshfs"/>
 

  		<package name="gdisk"/>

dnf5 (in obsoleting-dnf mode) provides /usr/bin/yum and obsoletes
yum, so we should drop the 'dnf-yum' entries (which installed
yum). dnf5 also appears to provide and obsolete microdnf, so we
should replace microdnf with dnf5 in the minimal image, I guess.
dnf5-plugins seems the logical replacement for dnf-plugins-core
(which is not removed yet, but is specific to dnf4).

Signed-off-by: Adam Williamson awilliam@redhat.com

This should only be merged in co-ordination with the update to dnf5 itself (currently https://bodhi.fedoraproject.org/updates/FEDORA-2024-8a41ea93a2 ).

hmm, actually, I think I can do a lighter touch version that should be mergeable immediately. trying that out.

mmm, no I can't, because of the change needed to config.xml , that has to be a big bang. given that, we may as well change all of this, I think.

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/628197386dea4915a7aa44e72339e7e0

hmm, seems like wrong syntax for dnf5 autoremove:

[ ERROR ]: 22:53:59 | KiwiPackagesDeletePhaseFailed: System package deletion failed: Package deletion failed: Unknown argument "cloud-init" for command "autoremove". Add "--help" for more information about the arguments.

so, it looks like in dnf 4, dnf autoremove <package> does dnf remove <package> with clean_requirements_on_remove forced to True (regardless of configuration). (the converse is dnf --noautoremove remove <package>). It looks like dnf5 has dropped these paths, so dnf5 autoremove only works with no package argument, to do a system-wide cleanup. If you want to remove a single package and its deps, you just should do dnf remove package, ensuring clean_requirements_on_remove is true.

https://github.com/OSInside/kiwi/pull/2536 should fix that.

I see it merged already. So is this one ready to go? Meaning, can I push it after I kick-off the dnf5 side-tag?

well, can you get the tests to re-run?

we should probably only merge this after the dnf5 update actually goes stable in Rawhide. but immediately after it goes stable.

well, can you get the tests to re-run?

I haven't found a way how to do that. I guess it should be enough to force push the same commit to the PR branch, but it seems I don't have permissions to do that.

Created follow-up https://pagure.io/fedora-kiwi-descriptions/pull-request/50 for re-running tests.

recheck

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/eb45ea71c1e040b09e3f9113e23584be

It looks like still the same issue, like the updated kiwi was not used yet...

I've digged into the logs and I see python3-kiwi-10.0.11-1.fc40 used, though the dnf5 related change was introduced in 10.0.13 when looking to upstream.
Edited a month ago by jkolarik

Oh, so I see it backported in the kiwi-10.0.11-2.fc40, but it's still in the testing, not yet in compose...

It is already in Rawhide, though fc40 containers are used in this case.

oh, sorry, I thought the F40 update was stable already. it should go stable in the next F40 updates compose, then we can re-test.

Tests were successfully re-run in the cloned PR, therefore this should be ready-to-go.

Pull-Request has been merged by adamwill
23 days ago
Metadata
None
No Tags
Changes Summary 3
+1 -1
file changed
config.xml
+4 -6
file changed
teams/cloud/container.xml
+0 -1
file changed
teams/cloud/vagrant.xml
Powered by Pagure 5.14.1
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.