Add openSUSE 15.6 to CI. (#17865)
* Add openSUSE 15.6 to CI. * Fix handling of log2journal. * Restructure conditional check.
Austin S. Hemmelgarn committed
Jun 13, 2024 at 09:18 UTC
6bacccaab818f5ad823e69efdc9893660d969751
2 files changed
+22
-9
.github/data/distros.yml
+9
-3
@@ -207,23 +207,29 @@ include:
207
208
- &opensuse
209
distro: opensuse
210
- version: "15.5"
210
+ version: "15.6"
211
support_type: Core
212
notes: ''
213
eol_check: true
214
bundle_sentry: *default_sentry
215
- base_image: opensuse/leap:15.5
215
+ base_image: opensuse/leap:15.6
216
jsonc_removal: |
217
zypper rm -y libjson-c-devel
218
packages: &opensuse_packages
219
type: rpm
220
- repo_distro: opensuse/15.5
220
+ repo_distro: opensuse/15.6
221
builder_rev: *def_builder_rev
222
arches:
223
- x86_64
224
- aarch64
225
test:
226
ebpf-core: true
227
+ - <<: *opensuse
228
+ version: "15.5"
229
+ base_image: opensuse/leap:15.5
230
+ packages:
231
+ <<: *opensuse_packages
232
+ repo_distro: opensuse/15.5
233
234
- &oracle
235
distro: oraclelinux
netdata.spec.in
+13
-6
@@ -99,6 +99,17 @@ AutoReqProv: yes
99
%global _have_mongo_exporter 1
100
%endif
101
102
+# log2journal can’t build on some systems
103
+%if 0%{?sle_version}
104
+%if %{sle_version} < 150600
105
+%global _have_log2journal 0
106
+%else
107
+%global _have_log2journal 1
108
+%endif
109
+%else
110
+%global _have_log2journal 1
111
+%endif
112
+
113
# If ML hasn’t been explicitly disabled or enabled yet, enable it now.
114
%if 0%{!?_have_ml:1}
115
%global _have_ml 1
@@ -147,9 +158,7 @@ BuildRequires: pkgconfig(libcurl)
158
BuildRequires: pkgconfig(liblz4)
159
BuildRequires: pkgconfig(yaml-0.1)
160
BuildRequires: pkgconfig(json-c)
150
-%if 0%{?suse_version}
151
-# log2journal is not available on these systems
152
-%else
161
+%if %{_have_log2journal}
162
BuildRequires: pkgconfig(libpcre2-8)
163
%endif
164
%if 0%{?suse_version}
@@ -494,9 +503,7 @@ rm -rf "${RPM_BUILD_ROOT}"
503
%{_libdir}/%{name}
504
%{_sbindir}/%{name}
505
%{_sbindir}/netdatacli
497
-%if 0%{?suse_version}
498
-# log2journal is not available on these systems
499
-%else
506
+%if %{_have_log2journal}
507
%{_sbindir}/log2journal
508
%endif
509
%{_sbindir}/systemd-cat-native