Add Oracle Linux 9 to officially supported platforms. (#13367)
* Add Oracle Linux 9 to officially supported platforms. * Add OL9 dependency handling code.
Austin S. Hemmelgarn committed
Jul 13, 2022 at 14:17 UTC
ba52f5d91f61389718e57502a94078b5beaae34f
4 files changed
+33
-7
.github/data/distros.yml
+8
-2
@@ -141,11 +141,12 @@ include:
141
test:
142
ebpf-core: false
143
144
- - distro: oraclelinux
144
+ - &oracle
145
+ distro: oraclelinux
146
version: "8"
147
jsonc_removal: |
148
dnf remove -y json-c-devel
148
- packages:
149
+ packages: &oracle_packages
150
type: rpm
151
repo_distro: ol/8
152
arches:
@@ -153,6 +154,11 @@ include:
154
- aarch64
155
test:
156
ebpf-core: true
157
+ - <<: *oracle
158
+ version: "9"
159
+ packages:
160
+ <<: *oracle_packages
161
+ repo_distro: ol/9
162
163
- &ubuntu
164
distro: ubuntu
packaging/PLATFORM_SUPPORT.md
+1
@@ -60,6 +60,7 @@ to work on these platforms with minimal user effort.
60
| Fedora | 36 | x86\_64, ARMv7, AArch64 | |
61
| Fedora | 35 | x86\_64, ARMv7, AArch64 | |
62
| openSUSE | Leap 15.3 | x86\_64, AArch64 | |
63
+| Oracle Linux | 9.x | x86\_64, AArch64 | |
64
| Oracle Linux | 8.x | x86\_64, AArch64 | |
65
| Red Hat Enterprise Linux | 9.x | x86\_64, AArch64 | |
66
| Red Hat Enterprise Linux | 8.x | x86\_64, AArch64 | |
packaging/installer/dependencies/ol.sh
+17
-5
@@ -1,6 +1,6 @@
1
#!/usr/bin/env bash
2
# Package tree used for installing netdata on distribution:
3
-# << Oracle Linux: [8] >>
3
+# << Oracle Linux: [8, 9] >>
4
5
set -e
6
@@ -90,13 +90,17 @@ check_flags() {
90
}
91
92
validate_tree_ol() {
93
-
93
opts=
94
if [ "${NON_INTERACTIVE}" -eq 1 ]; then
95
echo >&2 "Running in non-interactive mode"
96
opts="-y"
97
fi
98
99
+ # shellcheck disable=SC1091
100
+ source /etc/os-release
101
+
102
+ # shellcheck disable=SC2153
103
+ version="$(echo "${VERSION}" | cut -f 1 -d '.')"
104
105
echo >&2 " > Checking for config-manager ..."
106
if ! dnf config-manager &> /dev/null; then
@@ -106,9 +110,17 @@ validate_tree_ol() {
110
fi
111
112
echo " > Checking for CodeReady Builder ..."
109
- if ! dnf repolist | grep ol8_codeready_builder; then
110
- if prompt "CodeReadyBuilder not found, shall I install it?"; then
111
- dnf ${opts} config-manager --set-enabled ol8_codeready_builder || enable_repo
113
+ if [[ "${version}" =~ ^8(\..*)?$ ]]; then
114
+ if ! dnf repolist enabled | grep ol8_codeready_builder; then
115
+ if prompt "CodeReadyBuilder not found, shall I install it?"; then
116
+ dnf ${opts} config-manager --set-enabled ol8_codeready_builder || enable_repo
117
+ fi
118
+ fi
119
+ elif [[ "${version}" =~ ^9(\..*)?$ ]]; then
120
+ if ! dnf repolist enabled | grep ol9_codeready_builder; then
121
+ if prompt "CodeReadyBuilder not found, shall I install it?"; then
122
+ dnf ${opts} config-manager --set-enabled ol9_codeready_builder || enable_repo
123
+ fi
124
fi
125
fi
126
packaging/installer/install-required-packages.sh
+7
@@ -1528,6 +1528,13 @@ validate_tree_ol() {
1528
EOF
1529
fi
1530
fi
1531
+ elif [[ "${version}" =~ ^9(\..*)?$ ]]; then
1532
+ echo " > Checking for CodeReady Builder ..."
1533
+ if ! run ${sudo} dnf repolist enabled | grep -q codeready; then
1534
+ if prompt "CodeReady Builder not enabled, shall I enable it?"; then
1535
+ run ${sudo} dnf config-manager --set-enabled ol9_codeready_builder
1536
+ fi
1537
+ fi
1538
fi
1539
}
1540