@@ -164,7 +164,7 @@ os_release_detect() {
164
164
;;
165
165
flavor)
166
166
# Supported distro
167
- set -- debian ubuntu pop centos rhel OpenBSD
167
+ set -- debian ubuntu pop centos rocky rhel OpenBSD
168
168
local linux_distribution=" $( egrep ' ^ID=' /etc/os-release | awk -F " =" ' {print $2}' | tr -d " \" " ) "
169
169
local bsd_distribution=" none"
170
170
@@ -218,9 +218,9 @@ os_release_detect() {
218
218
219
219
os_release_helper
220
220
;;
221
- centos|rhel)
222
- # Supported centos releases
223
- set -- 8 9 9.1 9.2
221
+ centos|rocky| rhel)
222
+ # Supported centos/rocky/rhel releases
223
+ set -- 8 8.8 9 9.1 9.2
224
224
225
225
for item in " $@ " ;
226
226
do
@@ -503,7 +503,7 @@ grpc_collector_bin_install_deb() {
503
503
504
504
local git_clone=1
505
505
if [ ! -d " ${mdt_install_dir} " ]; then
506
- git clone " ${mdt_url } " -b " ${mdt_version } " " ${mdt_install_dir} "
506
+ git clone -b " ${mdt_version } " " ${mdt_url } " " ${mdt_install_dir} "
507
507
git_clone=" $? "
508
508
else
509
509
# assuming that the clone was already performed
@@ -554,7 +554,7 @@ grpc_collector_bin_install_rpm() {
554
554
555
555
local git_clone=1
556
556
if [ ! -d " ${mdt_install_dir} " ]; then
557
- git clone " ${mdt_url} " " ${mdt_install_dir} "
557
+ git clone -b " ${mdt_version} " " ${mdt_url} " " ${mdt_install_dir} "
558
558
git_clone=" $? "
559
559
else
560
560
# assuming that the clone was already performed
@@ -617,7 +617,7 @@ grpc_collector_lib_install_deb() {
617
617
618
618
local git_clone=1
619
619
if [ ! -d " ${mdt_install_dir} " ]; then
620
- git clone " ${mdt_url } " -b " ${mdt_version } " " ${mdt_install_dir} "
620
+ git clone -b " ${mdt_version } " " ${mdt_url } " " ${mdt_install_dir} "
621
621
git_clone=" $? "
622
622
else
623
623
# assuming that the clone was already performed
@@ -672,7 +672,7 @@ grpc_collector_lib_install_rpm() {
672
672
673
673
local git_clone=1
674
674
if [ ! -d " ${mdt_install_dir} " ]; then
675
- git clone " ${mdt_url} " " ${mdt_install_dir} "
675
+ git clone -b " ${mdt_version} " " ${mdt_url} " " ${mdt_install_dir} "
676
676
git_clone=" $? "
677
677
else
678
678
# assuming that the clone was already performed
@@ -743,11 +743,12 @@ grpc_collector_deploy() {
743
743
grpc_collector_lib_install_deb
744
744
fi
745
745
;;
746
- " Linux centos 8" | \
747
- " Linux centos 9" | \
748
- " Linux rhel 8" | \
749
- " Linux rhel 9" | \
750
- " Linux rhel 9.1" | \
746
+ " Linux centos 8" | \
747
+ " Linux centos 9" | \
748
+ " Linux rocky 8.8" | \
749
+ " Linux rhel 8" | \
750
+ " Linux rhel 9" | \
751
+ " Linux rhel 9.1" | \
751
752
" Linux rhel 9.2" )
752
753
# echo "grpc_collector_deploy_rpm()"
753
754
if [ " ${_os_info} " = " Linux centos 8" ] || [ " ${_os_info} " = " Linux centos 9" ]; then
@@ -760,8 +761,9 @@ grpc_collector_deploy() {
760
761
761
762
yum install -y epel-release > /dev/null 2>&1 || die " error - epel-release install failure" " ${err_epel_failure} "
762
763
763
- # Switch to a recent gcc version (old centos/rhel release)
764
- if [ " ${_os_info} " = " Linux centos 8" ] || [ " ${_os_info} " = " Linux rhel 8" ]; then
764
+ # Switch to a recent gcc version (old centos/rocky/rhel release)
765
+ if [ " ${_os_info} " = " Linux centos 8" ] || [ " ${_os_info} " = " Linux rhel 8" ] || [ " ${_os_info} " = " Linux rocky 8.8" ]; then
766
+ yum -y install gcc-toolset-11 > /dev/null 2>&1
765
767
source /opt/rh/gcc-toolset-11/enable
766
768
fi
767
769
detect_sysrpm_lib
0 commit comments