Skip to content

Commit

Permalink
Add openSUSE 15.6 to CI. (netdata#17865)
Browse files Browse the repository at this point in the history
* Add openSUSE 15.6 to CI.

* Fix handling of log2journal.

* Restructure conditional check.
  • Loading branch information
Ferroin authored Jun 13, 2024
1 parent d6d24ff commit 6baccca
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 9 deletions.
12 changes: 9 additions & 3 deletions .github/data/distros.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,23 +207,29 @@ include:

- &opensuse
distro: opensuse
version: "15.5"
version: "15.6"
support_type: Core
notes: ''
eol_check: true
bundle_sentry: *default_sentry
base_image: opensuse/leap:15.5
base_image: opensuse/leap:15.6
jsonc_removal: |
zypper rm -y libjson-c-devel
packages: &opensuse_packages
type: rpm
repo_distro: opensuse/15.5
repo_distro: opensuse/15.6
builder_rev: *def_builder_rev
arches:
- x86_64
- aarch64
test:
ebpf-core: true
- <<: *opensuse
version: "15.5"
base_image: opensuse/leap:15.5
packages:
<<: *opensuse_packages
repo_distro: opensuse/15.5

- &oracle
distro: oraclelinux
Expand Down
19 changes: 13 additions & 6 deletions netdata.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,17 @@ AutoReqProv: yes
%global _have_mongo_exporter 1
%endif

# log2journal can’t build on some systems
%if 0%{?sle_version}
%if %{sle_version} < 150600
%global _have_log2journal 0
%else
%global _have_log2journal 1
%endif
%else
%global _have_log2journal 1
%endif

# If ML hasn’t been explicitly disabled or enabled yet, enable it now.
%if 0%{!?_have_ml:1}
%global _have_ml 1
Expand Down Expand Up @@ -147,9 +158,7 @@ BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(liblz4)
BuildRequires: pkgconfig(yaml-0.1)
BuildRequires: pkgconfig(json-c)
%if 0%{?suse_version}
# log2journal is not available on these systems
%else
%if %{_have_log2journal}
BuildRequires: pkgconfig(libpcre2-8)
%endif
%if 0%{?suse_version}
Expand Down Expand Up @@ -494,9 +503,7 @@ rm -rf "${RPM_BUILD_ROOT}"
%{_libdir}/%{name}
%{_sbindir}/%{name}
%{_sbindir}/netdatacli
%if 0%{?suse_version}
# log2journal is not available on these systems
%else
%if %{_have_log2journal}
%{_sbindir}/log2journal
%endif
%{_sbindir}/systemd-cat-native
Expand Down

0 comments on commit 6baccca

Please sign in to comment.