summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorAustin S. Hemmelgarn <austin@netdata.cloud>2022-06-06 07:30:57 -0400
committerGitHub <noreply@github.com>2022-06-06 07:30:57 -0400
commit524fc560633a0d1f9077aa93b9d91992ee987e6e (patch)
tree90a255b6522df9d0b751c0ad1b5ba96ba9898b90 /packaging
parent123e923f76ad2cc458dd98b01ba8b29f2306bee2 (diff)
Added Alma Linux 9 and RHEL 9 support to CI and packaging. (#13058)
* Added Alma Linux 9 and RHEL 9 support to CI and packaging. * Fix RPM deps for Alma 9. * Fix package testing code for Alma 9.
Diffstat (limited to 'packaging')
-rw-r--r--packaging/PLATFORM_SUPPORT.md4
-rwxr-xr-xpackaging/installer/dependencies/centos.sh20
-rwxr-xr-xpackaging/installer/install-required-packages.sh18
3 files changed, 37 insertions, 5 deletions
diff --git a/packaging/PLATFORM_SUPPORT.md b/packaging/PLATFORM_SUPPORT.md
index fcb3691f83..9476989095 100644
--- a/packaging/PLATFORM_SUPPORT.md
+++ b/packaging/PLATFORM_SUPPORT.md
@@ -51,6 +51,7 @@ to work on these platforms with minimal user effort.
| Platform | Version | Official Native Packages | Notes |
| -------- | ------- | ------------------------ | ----- |
| Alpine Linux | 3.16 | No | The latest release of Alpine Linux is guaranteed to remain at **Core** tier due to usage for our Docker images |
+| Alma Linux | 9.x | x86\_64, AArch64 | Also includes support for Rocky Linux and other ABI compatible RHEL derivatives |
| Alma Linux | 8.x | x86\_64, AArch64 | Also includes support for Rocky Linux and other ABI compatible RHEL derivatives |
| CentOS | 7.x | x86\_64 | |
| Docker | 19.03 or newer | x86\_64, i386, ARMv7, AArch64, POWER8+ | See our [Docker documentation](/packaging/docker/README.md) for more info on using Netdata on Docker |
@@ -62,8 +63,9 @@ to work on these platforms with minimal user effort.
| Fedora | 34 | x86\_64, ARMv7, AArch64 | |
| openSUSE | Leap 15.3 | x86\_64, AArch64 | |
| Oracle Linux | 8.x | x86\_64, AArch64 | |
-| Red Hat Enterprise Linux | 7.x | x86\_64 | |
+| Red Hat Enterprise Linux | 9.x | x86\_64, AArch64 | |
| Red Hat Enterprise Linux | 8.x | x86\_64, AArch64 | |
+| Red Hat Enterprise Linux | 7.x | x86\_64 | |
| Ubuntu | 22.04 | x86\_64, ARMv7, AArch64 | |
| Ubuntu | 21.10 | x86\_64, i386, ARMv7, AArch64 | |
| Ubuntu | 20.04 | x86\_64, i386, ARMv7, AArch64 | |
diff --git a/packaging/installer/dependencies/centos.sh b/packaging/installer/dependencies/centos.sh
index 738a0ce75b..eea71ca325 100755
--- a/packaging/installer/dependencies/centos.sh
+++ b/packaging/installer/dependencies/centos.sh
@@ -10,7 +10,6 @@ declare -a package_tree=(
make
autoconf
autoconf-archive
- autogen
automake
libatomic
libtool
@@ -106,7 +105,22 @@ validate_tree_centos() {
echo >&2 " > CentOS Version: $(os_version) ..."
- if [[ $(os_version) =~ ^8(\..*)?$ ]]; then
+ if [[ $(os_version) =~ ^9(\..*)?$ ]]; then
+ package_manager=dnf
+ echo >&2 " > Checking for config-manager ..."
+ if ! dnf config-manager --help &> /dev/null; then
+ if prompt "config-manager not found, shall I install it?"; then
+ dnf ${opts} install 'dnf-command(config-manager)'
+ fi
+ fi
+
+ echo >&2 " > Checking for CRB ..."
+ if ! dnf repolist | grep CRB; then
+ if prompt "CRB not found, shall I install it?"; then
+ dnf ${opts} config-manager --set-enabled crb
+ fi
+ fi
+ elif [[ $(os_version) =~ ^8(\..*)?$ ]]; then
package_manager=dnf
echo >&2 " > Checking for config-manager ..."
if ! dnf config-manager --help &> /dev/null; then
@@ -128,7 +142,7 @@ validate_tree_centos() {
echo >&2 " > Installing Judy-devel directly ..."
dnf ${opts} install http://mirror.centos.org/centos/8/PowerTools/x86_64/os/Packages/Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.x86_64.rpm
dnf makecache --refresh
-elif [[ $(os_version) =~ ^7(\..*)?$ ]]; then
+ elif [[ $(os_version) =~ ^7(\..*)?$ ]]; then
package_manager=yum
echo >&2 " > Checking for EPEL ..."
if ! rpm -qa | grep epel-release > /dev/null; then
diff --git a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh
index 7c48e9bc38..8855acebdb 100755
--- a/packaging/installer/install-required-packages.sh
+++ b/packaging/installer/install-required-packages.sh
@@ -660,6 +660,8 @@ declare -A pkg_autogen=(
# exceptions
['centos-6']="WARNING|"
['rhel-6']="WARNING|"
+ ['centos-9']="NOTREQUIRED|"
+ ['rhel-9']="NOTREQUIRED|"
)
declare -A pkg_automake=(
@@ -1601,7 +1603,21 @@ validate_tree_centos() {
echo >&2 " > CentOS Version: ${version} ..."
- if [[ "${version}" =~ ^8(\..*)?$ ]]; then
+ if [[ "${version}" =~ ^9(\..*)?$ ]]; then
+ echo >&2 " > Checking for config-manager ..."
+ if ! run ${sudo} dnf config-manager --help; then
+ if prompt "config-manager not found, shall I install it?"; then
+ run ${sudo} dnf ${opts} install 'dnf-command(config-manager)'
+ fi
+ fi
+
+ echo >&2 " > Checking for CRB ..."
+ if ! run dnf ${sudo} repolist | grep CRB; then
+ if prompt "CRB not found, shall I install it?"; then
+ run ${sudo} dnf ${opts} config-manager --set-enabled crb
+ fi
+ fi
+ elif [[ "${version}" =~ ^8(\..*)?$ ]]; then
echo >&2 " > Checking for config-manager ..."
if ! run ${sudo} yum config-manager --help; then
if prompt "config-manager not found, shall I install it?"; then