-
Notifications
You must be signed in to change notification settings - Fork 376
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Migrate test-suite macro configuration out of root's ~/.rpmmacros #3524
Migrate test-suite macro configuration out of root's ~/.rpmmacros #3524
Conversation
Somehow nobody has noticed we don't create the per-host configuration directory on install, probably didn't even in autoconf days. We'll need this now in the next commits though.
dc4a8ad
to
96f41cf
Compare
tests 211 and 213 break for 39578b4 and a54e29f
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some suggestions around the use of ARG
, see comments inline. Otherwise, looks sane :)
it breaks is I checkout those patches instead of the whole branch. |
We've discussed this in the past - it would be nice if we ensured that every commit passes the CI separately, but then, it would make you wait a lot longer for it to finish. So it's really a compromise. Most of the time, I think it's fine to just CI the overall patchset. When you need to bisect/backport individual patches, that's where you may get burned, of course. |
These /usr/lib/sysimage/rpm/pubkeys paths are valid for the OS rpm in the test-container, but that might not have any correlation to the *built* rpm we're supposed to be testing here. This is masked by the %_dbpath override in the Dockerfile which we'll be removing in the next step.
This override exists to make system rpmdb accessible in eg "make shell" but it causes complications wrt the prefix (see below + next commits) and also masks test bugs (see previous commit). We can resurrect this functionality later on if we find solutions that avoid the issues. This is the first step to fixing rpm-software-management#3521.
The second step to fixing rpm-software-management#3521
The third step to fixing rpm-software-management#3521
Signing key configuration is obviously something that belongs to the user's macros, but lets get on with the times and use the new XDG config directory for that. The remaining references to ~/.rpmmacros in rpmmacro.at are related to testing behavior with the old-style configuration and need to be preserved. This is the fourth and final step to rpm-software-management#3521. Fixes: rpm-software-management#3521
96f41cf
to
02490f7
Compare
Dropped the whole %_dbpath override thing now - as this exercise points out it can actually mask test-bugs so we'd better find some other way of achieving that before reintroducing. All individual commits should also pass now. That's a standard we should always try to adhere to, but easy to miss... |
Should, but apparently I only tested "make check" 🤦 (or something). Argh. |
Yeah, it's the prefix biting us back in return... 🤦 |
This turned out quite differently from what I initially planned so I'll just close this and start a new PR instead. |
See commits for details.