From: Anil Belur Date: Mon, 9 Jan 2023 08:11:25 +0000 (+1000) Subject: Revert "Fix: Add missing sctp.h header file to sonarqube cmake/build" X-Git-Tag: v0.83.3~1 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=3f72603a344bffd6aaf016e001f93165025d81e8;p=releng%2Fglobal-jjb.git Revert "Fix: Add missing sctp.h header file to sonarqube cmake/build" This reverts commit 5c69133bfea3ca1b895219b509b9c1353e122c4c. The changes being installed runtime through the global-jjb scripts should be moved into the ansible-roles repo. Change-Id: I31a03f97cee285ea1bdb1227e4f150ac1f5f8b9d Signed-off-by: Anil Belur --- diff --git a/releasenotes/notes/fix-missing-sctp-header-36d78588c6d1a644.yaml b/releasenotes/notes/fix-missing-sctp-header-36d78588c6d1a644.yaml deleted file mode 100644 index a27561e1..00000000 --- a/releasenotes/notes/fix-missing-sctp-header-36d78588c6d1a644.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -fixes: - - | - Address missing sctp.h header file during sonarqube cmake/build diff --git a/shell/cmake-sonarqube.sh b/shell/cmake-sonarqube.sh index da433b29..d335419d 100644 --- a/shell/cmake-sonarqube.sh +++ b/shell/cmake-sonarqube.sh @@ -15,20 +15,6 @@ echo "---> cmake-sonarqube.sh" set -eux -o pipefail -# Add missing sctp.h header file to prevent cmake/build failure -if (grep Ubuntu /etc/os-release > /dev/null 2>&1); then - echo "Installing libsctp-dev dependency for Ubuntu" - sudo apt-get update - sudo apt-get install -y libsctp-dev -elif (grep RedHat /etc/os-release > /dev/null 2>&1) || \ - (grep CentOS /etc/os-release > /dev/null 2>&1); then - echo "Installing lksctp-tools-devel dependency for CentOS/RedHat" - sudo yum install -y lksctp-tools-devel -else - echo "Unmatched OS/Distribution" - echo "Missing sctp library not installed" -fi - build_dir="${BUILD_DIR:-$WORKSPACE/build}" build_wrap_dir="${BUILD_WRAP_DIR:-$WORKSPACE/bw-output}" cmake_opts="${CMAKE_OPTS:-}"