From: Michal Cmarada <mcmarada@cisco.com>
Date: Fri, 5 Apr 2019 10:07:35 +0000 (+0200)
Subject: JVPP enable devtoolset7 compiler
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=d544aa4c74e432f14c98b00e2ea468a2d7afe54e;p=ci-management.git

JVPP enable devtoolset7 compiler


Change-Id: I25a5fe27e29c2a097392fc79b1c0cba883736d19
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
---

diff --git a/jjb/jvpp/include-raw-jvpp-build.sh b/jjb/jvpp/include-raw-jvpp-build.sh
index 7a0a5fa71..3ccc97e09 100755
--- a/jjb/jvpp/include-raw-jvpp-build.sh
+++ b/jjb/jvpp/include-raw-jvpp-build.sh
@@ -43,7 +43,8 @@ echo "Building using \"make package\""
 [[ "x${DRYRUN}" == "xTrue" ]] || cd Requirements && make UNATTENDED=yes install-dep && cd ..
 [[ "x${DRYRUN}" == "xTrue" ]] || pwd
 if [[ "${OS_ID}" == "centos" ]]; then
-    [[ "x${DRYRUN}" == "xTrue" ]] || cmake3 .
+    [[ "x${DRYRUN}" == "xTrue" ]] || /opt/rh/devtoolset-7/enable
+    [[ "x${DRYRUN}" == "xTrue" ]] || cmake3 . -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-7/root/bin"
 else
     [[ "x${DRYRUN}" == "xTrue" ]] || cmake .
 fi