Merge remote-tracking branch 'origin/rhel76-support' into develop_integration_2019_w07_v2

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([

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

cmake_targets/tools/build_helper

@@ -102,6 +102,7 @@ check_supported_distribution() {
         "ubuntu14.04") return 0 ;;
         "fedora24")    return 0 ;;
         "rhel7")       return 0 ;;
+	"rhel7.6")     return 0 ;; 
         "centos7")     return 0 ;;
     esac
     return 1
@@ -310,10 +311,20 @@ 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
-      $SUDO uhd_images_downloader
+      if [[ "$distribution" == "rhel7.6" ]]; then
+          $SUDO /usr/local/bin/uhd_images_downloader
+      else
+          $SUDO uhd_images_downloader
+      fi
     else
-      $SUDO uhd_images_downloader -i $1
+      if [[ "$distribution" == "rhel7.6" ]]; then
+          $SUDO /usr/local/bin/uhd_images_downloader -i $1
+      else
+          $SUDO uhd_images_downloader -i $1
+      fi
     fi
 }