diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab index fc0290fc44c2a03ed428511fb067b86c16ace0aa..18c208359e5c3dee8e4593cf347420c21593cc05 100644 --- a/ci-scripts/Jenkinsfile-gitlab +++ b/ci-scripts/Jenkinsfile-gitlab @@ -260,7 +260,7 @@ pipeline { expression {doRedHatBuild} } steps { - gitlabCommitStatus(name: "Build eNb-USRP-CentOS") { + gitlabCommitStatus(name: "Build eNb-USRP-RHE") { script { try { withCredentials([ diff --git a/ci-scripts/reportBuildLocally.sh b/ci-scripts/reportBuildLocally.sh index bfce7acd8fe241ecaea8f4028fe2763eb2cec629..e2259da48a497a2d67af0c699cef0cd09a46e9a8 100755 --- a/ci-scripts/reportBuildLocally.sh +++ b/ci-scripts/reportBuildLocally.sh @@ -492,7 +492,7 @@ function report_build { if [ -e ./archives/red_hat ] then - echo " <h2>Red Hat (CentOS Linux release 7.4.1708) -- Summary</h2>" >> ./build_results.html + echo " <h2>Red Hat Enterprise Linux Server release 7.6) -- Summary</h2>" >> ./build_results.html summary_table_header "Red Hat -- OAI Build eNB -- USRP option" ./archives/red_hat summary_table_row "LTE SoftModem - Release 14" ./archives/red_hat/lte-softmodem.Rel14.txt "Built target lte-softmodem" ./enb_usrp_rh_row1.html diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index ad69ca3794b1c690b9bf319fd578e7b552efbdb0..048ba300e7ba5db425437b3905981c79d8bdd4f8 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -311,15 +311,16 @@ install_usrp_uhd_driver() { # On newer kernels, it fails to install $SUDO apt-get -y install uhd-host fi + # quick workaround for RHE7.6 + local distribution=$(get_distribution_release) if [ -z $1 ]; then - # quick workaround - if [[ "$OS_DISTRO" == "rhel7.6" ]]; then + if [[ "$distribution" == "rhel7.6" ]]; then $SUDO /usr/local/bin/uhd_images_downloader else $SUDO uhd_images_downloader fi else - if [[ "$OS_DISTRO" == "rhel7.6" ]]; then + if [[ "$distribution" == "rhel7.6" ]]; then $SUDO /usr/local/bin/uhd_images_downloader -i $1 else $SUDO uhd_images_downloader -i $1