devtools-9

.gitlab-ci.yml

@@ -380,7 +380,7 @@ centos7_x86_64:
     - export CHAOS_LIB_HASH=`git log -n 1 --pretty="%h"`;export CHAOS_LAST_TAG=`git describe --abbrev=0`;cd -;
     - cd html/chaos_dashboard/;./tag.sh $CI_COMMIT_REF_NAME;cd -
     - cd html/chaos_dashboard/js/jchaos;git checkout $CI_COMMIT_REF_NAME;cd -
-    - export CC=/opt/rh/devtoolset-8/root/usr/bin/gcc;export CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ 
+    - export CC=/opt/rh/devtoolset-8/root/usr/bin/gcc;export CXX=/opt/rh/devtoolset-9/root/usr/bin/g++ 
     - if ! cmake -DKAFKA_RDK_ENABLE=ON  -DCMAKE_BUILD_TYPE=Release -DCHAOS_EPICS_SUPPORT=ON -DCHAOS_ARCHITECTURE_TEST=ON -DCHAOS_VERSION_MAJOR="$CI_COMMIT_REF_NAME.$CHAOS_LIB_HASH.$REVNAME ($CHAOS_LAST_TAG)" -DCHAOS_VERSION_MINOR="$CI_JOB_STAGE.$CI_COMMIT_SHA" -DCHAOS_WAN=ON -DCHAOS_DRIVER_LUMINOMETER=ON -DOPENCV=$INSTALL_DIR -DIDS=ueye494 -DBASLER=ON -DCAEN2527=ON -DENABLE_MEMCACHE=ON -DCHAOS_BUILD_ID=${CI_PIPELINE_ID} -DCERN_ROOT=$INSTALL_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR . |& tee $DISTRIB_PREFIX/bundle.configuration.log;then cat /tmp/cmake.log;fi
     - if ! make  -j 4 install |& tee $INSTALL_DIR/bundle.compilation.log;then tar cfz compilation.tar.gz `find . -name "*.log"` $INSTALL_DIR/bundle.compilation.log;exit 1;fi
     - ./tools/strip_symbols.sh $INSTALL_DIR
@@ -664,7 +664,7 @@ centos7_test_x86_64:
     - git clone https://baltig.infn.it/chaos-lnf-control/chaos_dashboard.git -b $CI_COMMIT_REF_NAME --recurse-submodules
     - rm -rf /usr/local/chaos/chaos-distrib/html;mkdir /usr/local/chaos/chaos-distrib/html;cp -r chaos_dashboard /usr/local/chaos/chaos-distrib/html/
     - $INSTALL_DIR/tools/dbinit.sh couchbase mongo
-    - scl enable devtoolset-8 bash
+    - scl enable devtoolset-9 bash
     - source $INSTALL_DIR/chaos_env.sh
     - if [ -n "$USE_MDS_CONFIG" ];then echo "* Using $USE_MDS_CONFIG" ; cp $USE_MDS_CONFIG $INSTALL_DIR/etc/mds.cfg;fi    
     - if ! $INSTALL_DIR/bin/TestFramework --direct-io-impl ZMQ --rpc-server-impl ZMQ;then export HEAPCHECK=strict; echo "*retrying with heap check"; $INSTALL_DIR/bin/TestFramework --direct-io-impl ZMQ --rpc-server-impl ZMQ; exit 1;fi