scripts/build/ceph.spec.in: fix rhel version checks#66772
Conversation
|
Should solve most of what #66736 tried to solve. |
296f5f6 to
668a254
Compare
|
Tested on a clean container. This solves most of Fedora-43 installation issues |
tchaikov
left a comment
There was a problem hiding this comment.
Thanks. Checking. Update: fixed 3 additional lines. Can you take a look at line 38, and verify that this is the logic we want (for Fedora)? |
tchaikov
left a comment
There was a problem hiding this comment.
please squash the changes into a single commit. and add the explanation on why we need them, and their impact to the built artifacts.
cea9203 to
e295141
Compare
|
@tchaikov: thanks for your help, Kefu. |
|
jenkins test make check |
|
jenkins test make check arm64 |
|
jenkins test windows |
1 similar comment
|
jenkins test windows |
|
jenkins test make check |
|
jenkins test windows |
|
the windows test failure is tracked by https://tracker.ceph.com/issues/74308 cc @djgalloway hi David, in case you are interested. |
|
jenkins test windows |
1 similar comment
|
jenkins test windows |
|
@idryomov - do you see any reason to not merge this now? It can't make Fedora 43 installation worse than it is now, and I do not think Teuthology tests this more than the CI pipeline. What is your recommendation? |
... but it can break installation on other RPM-based OSes, at least in theory ;) I'd recommend at least getting the RPM packages built in Shaman -- |
Sure. I think I did that, but will verify that it was with the latest version. Thanks |
Fixing multiple instances in this file where
the RHEL version is checked - without properly
ensuring that the OS is indeed RHEL.
0%{?rhel} is only defined on RHEL systems, and
is '0' otherwise. That resulted, for example, in
Fedora 43 having 'gts_version' incorrectly
set to '13'.
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
e295141 to
e042983
Compare
|
jenkins test windows |
|
Following Ilya's comment above, and as "Shaman" builds were OK, I will be merging this PR now. |
Fixing multiple instances in this file where the RHEL version
is checked - without properly ensuring that the OS is indeed RHEL.
0%{?rhel} is only defined on RHEL systems, and is '0' otherwise.
That resulted, for example, in Fedora 43 having 'gts_version'
incorrectly set to '13'.
Edit (post merge): fixes https://tracker.ceph.com/issues/74368