diff --git a/.matrix.yml b/.matrix.yml index d067496eb7c..3fa9879d0f9 100644 --- a/.matrix.yml +++ b/.matrix.yml @@ -91,6 +91,13 @@ OS: ARCH: - x86_64 EL: + "10": + TYPE: rpm + IMAGE: rhel10 + CUSTOM_TEST_IMAGES: [ RHEL ] + ARCH: + - x86_64 + - aarch64 "9": TYPE: rpm IMAGE: rhel9 diff --git a/CHANGELOG.md b/CHANGELOG.md index e1b71dd486d..1c2ec79cea5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - debian: Add missing build dependencies [PR #2128] - systemtests: fail if daemons have config warnings [PR #2144] - contrib: check_chunk.py improve README.md instructions [PR #2147] +- build: add support for el10 [PR #2106] [PR #1893]: https://github.com/bareos/bareos/pull/1893 [PR #2018]: https://github.com/bareos/bareos/pull/2018 @@ -54,6 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [PR #2097]: https://github.com/bareos/bareos/pull/2097 [PR #2102]: https://github.com/bareos/bareos/pull/2102 [PR #2105]: https://github.com/bareos/bareos/pull/2105 +[PR #2106]: https://github.com/bareos/bareos/pull/2106 [PR #2109]: https://github.com/bareos/bareos/pull/2109 [PR #2111]: https://github.com/bareos/bareos/pull/2111 [PR #2116]: https://github.com/bareos/bareos/pull/2116 diff --git a/cmake/BareosCpmPackages.cmake b/cmake/BareosCpmPackages.cmake index 273c5b7c5d9..05cd7b6d29b 100644 --- a/cmake/BareosCpmPackages.cmake +++ b/cmake/BareosCpmPackages.cmake @@ -1,6 +1,6 @@ # BAREOS® - Backup Archiving REcovery Open Sourced # -# Copyright (C) 2024-2024 Bareos GmbH & Co. KG +# Copyright (C) 2024-2025 Bareos GmbH & Co. KG # # This program is Free Software; you can redistribute it and/or # modify it under the terms of version three of the GNU Affero General Public @@ -94,7 +94,7 @@ CPMAddPackage( NAME xxHash VERSION 0.8.0 GITHUB_REPOSITORY Cyan4973/xxHash - GIT_TAG v0.8.2 + GIT_TAG v0.8.3 EXCLUDE_FROM_ALL YES SOURCE_SUBDIR cmake_unofficial OPTIONS "XXHASH_BUILD_XXHSUM OFF" "DISPATCH ON" diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec index b02d64d46aa..fbcdce7df9d 100644 --- a/core/platforms/packaging/bareos.spec +++ b/core/platforms/packaging/bareos.spec @@ -96,10 +96,13 @@ BuildRequires: fmt-devel %endif %if 0%{?rhel} >= 7 -%define glusterfs 1 %define systemd_support 1 %endif +%if 0%{?rhel} >= 7 && (0%{?rhel} <= 9) +%define glusterfs 1 +%endif + %if 0%{?rhel} == 7 %define webui 0 %define __python python3 diff --git a/docs/pkglists/EL_10.aarch64 b/docs/pkglists/EL_10.aarch64 new file mode 100644 index 00000000000..b7673330065 --- /dev/null +++ b/docs/pkglists/EL_10.aarch64 @@ -0,0 +1,56 @@ +aarch64/bareos +aarch64/bareos-bconsole +aarch64/bareos-client +aarch64/bareos-common +aarch64/bareos-contrib-director-python-plugins +aarch64/bareos-contrib-filedaemon-python-plugins +aarch64/bareos-contrib-tools +aarch64/bareos-database-common +aarch64/bareos-database-postgresql +aarch64/bareos-database-tools +aarch64/bareos-director +aarch64/bareos-director-python-plugins-common +aarch64/bareos-director-python3-plugin +aarch64/bareos-filedaemon +aarch64/bareos-filedaemon-grpc-python3-plugin +aarch64/bareos-filedaemon-ldap-python-plugin +aarch64/bareos-filedaemon-libcloud-python-plugin +aarch64/bareos-filedaemon-mariabackup-python-plugin +aarch64/bareos-filedaemon-percona-xtrabackup-python-plugin +aarch64/bareos-filedaemon-postgresql-python-plugin +aarch64/bareos-filedaemon-python-plugins-common +aarch64/bareos-filedaemon-python3-plugin +aarch64/bareos-storage +aarch64/bareos-storage-dedupable +aarch64/bareos-storage-dplcompat +aarch64/bareos-storage-droplet +aarch64/bareos-storage-fifo +aarch64/bareos-storage-python-plugins-common +aarch64/bareos-storage-python3-plugin +aarch64/bareos-storage-tape +aarch64/bareos-tools +aarch64/bareos-traymonitor +aarch64/bareos-webui +debug/aarch64/bareos-bconsole-debuginfo +debug/aarch64/bareos-common-debuginfo +debug/aarch64/bareos-database-common-debuginfo +debug/aarch64/bareos-database-tools-debuginfo +debug/aarch64/bareos-debuginfo +debug/aarch64/bareos-debugsource +debug/aarch64/bareos-director-debuginfo +debug/aarch64/bareos-director-python3-plugin-debuginfo +debug/aarch64/bareos-filedaemon-debuginfo +debug/aarch64/bareos-filedaemon-grpc-python3-plugin-debuginfo +debug/aarch64/bareos-filedaemon-python3-plugin-debuginfo +debug/aarch64/bareos-storage-debuginfo +debug/aarch64/bareos-storage-dedupable-debuginfo +debug/aarch64/bareos-storage-dplcompat-debuginfo +debug/aarch64/bareos-storage-droplet-debuginfo +debug/aarch64/bareos-storage-fifo-debuginfo +debug/aarch64/bareos-storage-python3-plugin-debuginfo +debug/aarch64/bareos-storage-tape-debuginfo +debug/aarch64/bareos-tools-debuginfo +debug/aarch64/bareos-traymonitor-debuginfo +noarch/python3-bareos +src/bareos +src/python-bareos diff --git a/docs/pkglists/EL_10.x86_64 b/docs/pkglists/EL_10.x86_64 new file mode 100644 index 00000000000..3b2b034ae3f --- /dev/null +++ b/docs/pkglists/EL_10.x86_64 @@ -0,0 +1,62 @@ +debug/x86_64/bareos-bconsole-debuginfo +debug/x86_64/bareos-common-debuginfo +debug/x86_64/bareos-database-common-debuginfo +debug/x86_64/bareos-database-tools-debuginfo +debug/x86_64/bareos-debuginfo +debug/x86_64/bareos-debugsource +debug/x86_64/bareos-director-debuginfo +debug/x86_64/bareos-director-python3-plugin-debuginfo +debug/x86_64/bareos-filedaemon-debuginfo +debug/x86_64/bareos-filedaemon-grpc-python3-plugin-debuginfo +debug/x86_64/bareos-filedaemon-python3-plugin-debuginfo +debug/x86_64/bareos-storage-debuginfo +debug/x86_64/bareos-storage-dedupable-debuginfo +debug/x86_64/bareos-storage-dplcompat-debuginfo +debug/x86_64/bareos-storage-droplet-debuginfo +debug/x86_64/bareos-storage-fifo-debuginfo +debug/x86_64/bareos-storage-python3-plugin-debuginfo +debug/x86_64/bareos-storage-tape-debuginfo +debug/x86_64/bareos-tools-debuginfo +debug/x86_64/bareos-traymonitor-debuginfo +debug/x86_64/bareos-vadp-dumper-debuginfo +noarch/python3-bareos +src/bareos +src/bareos-vmware-vix-disklib +src/python-bareos +x86_64/bareos +x86_64/bareos-bconsole +x86_64/bareos-client +x86_64/bareos-common +x86_64/bareos-contrib-director-python-plugins +x86_64/bareos-contrib-filedaemon-python-plugins +x86_64/bareos-contrib-tools +x86_64/bareos-database-common +x86_64/bareos-database-postgresql +x86_64/bareos-database-tools +x86_64/bareos-director +x86_64/bareos-director-python-plugins-common +x86_64/bareos-director-python3-plugin +x86_64/bareos-filedaemon +x86_64/bareos-filedaemon-grpc-python3-plugin +x86_64/bareos-filedaemon-ldap-python-plugin +x86_64/bareos-filedaemon-libcloud-python-plugin +x86_64/bareos-filedaemon-mariabackup-python-plugin +x86_64/bareos-filedaemon-percona-xtrabackup-python-plugin +x86_64/bareos-filedaemon-postgresql-python-plugin +x86_64/bareos-filedaemon-python-plugins-common +x86_64/bareos-filedaemon-python3-plugin +x86_64/bareos-storage +x86_64/bareos-storage-dedupable +x86_64/bareos-storage-dplcompat +x86_64/bareos-storage-droplet +x86_64/bareos-storage-fifo +x86_64/bareos-storage-python-plugins-common +x86_64/bareos-storage-python3-plugin +x86_64/bareos-storage-tape +x86_64/bareos-tools +x86_64/bareos-traymonitor +x86_64/bareos-vadp-dumper +x86_64/bareos-vmware-plugin +x86_64/bareos-vmware-plugin-compat +x86_64/bareos-vmware-vix-disklib +x86_64/bareos-webui diff --git a/systemtests/scripts/cleanup b/systemtests/scripts/cleanup index 47a6adf2f00..f7bed2e668d 100755 --- a/systemtests/scripts/cleanup +++ b/systemtests/scripts/cleanup @@ -24,6 +24,9 @@ function deletefiles(){ # cleanup chrome user data (selenium tests) rm -rf /tmp/chrome-user-data-* } + +tail -n +1 "${working:?}"/*.traceback 2>/dev/null || true + deletefiles ${scripts}/drop_bareos_database ${DBTYPE} >/dev/null 2>&1