Commit b6c19e4
committed
src/konflux-rpm-lockfile: use coreos-pool URLs only
Until now, we tackled the DNF5 issue [1] by prioritizing the URL
location of the repo 'coreos-pool' when multiple repo were found
for the say locked NEVRA.
But, if that locked NEVRA has only one URL location coming from
the fedora repos i.e: fedora, fedora-updates, then the repoquery
command returns a broken URL location for ppc64le and s390x arches
because of the DNF5 issue. It returns the URL from the first item
defined in baseurl, whereas the resolution worked with the second
item i.e fedora-secondary repo where the RPMs for ppc64le and
s390x are available.
This patch fixes this issue with another approach wich consists
of using coreos-pool URLs only. For each non coreos-pool URL we
extract the NEVRA and arch to construct the URL into the
canonical koji path structure. As soon as the 'bump-lockfile'
commit is merged, the coreos-koji-tagger will tag to 'coreos-pool'.
So it's safe to craft the URL prior its availability.
One downside is a possible race condition between the koji
tag operation and the CI/CD system building hermetically. The other
downside is that the `rpms.lock.yaml` changes cannot be tested
locally as this relies on remote koji tagging operation. But,
as it's consumed for Konflux only now, I'd say it's ok.
[1] rpm-software-management/dnf5#24661 parent 7a80e77 commit b6c19e4
1 file changed
+42
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
14 | 54 | | |
15 | 55 | | |
16 | 56 | | |
| |||
118 | 158 | | |
119 | 159 | | |
120 | 160 | | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | 161 | | |
126 | 162 | | |
127 | 163 | | |
| |||
201 | 237 | | |
202 | 238 | | |
203 | 239 | | |
| 240 | + | |
| 241 | + | |
204 | 242 | | |
205 | 243 | | |
206 | 244 | | |
| |||
0 commit comments