diff --git a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh index 2168fd66a709c759fe7f4e5647a3e30ce59c71dd..253020b428f44a689104f16b7ad43e73438c5048 100755 --- a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh +++ b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh @@ -39,7 +39,7 @@ cp ~/CTA/.git/hooks/post-checkout ~/CTA/.git/hooks/post-merge echo Creating source rpm rm -rf ~/CTA-build-srpm mkdir -p ~/CTA-build-srpm -(cd ~/CTA-build-srpm && cmake -DPackageOnly:Bool=true ../CTA; make cta_srpm) +(cd ~/CTA-build-srpm && cmake3 -DPackageOnly:Bool=true ../CTA; make cta_srpm) echo Installing repos @@ -65,6 +65,6 @@ sudo yum-builddep -y ~/CTA-build-srpm/RPM/SRPMS/cta-0-1.src.rpm echo Building CTA rm -rf ~/CTA-build mkdir -p ~/CTA-build -(cd ~/CTA-build && cmake ../CTA; make -j 4) +(cd ~/CTA-build && cmake3 ../CTA; make -j 4) echo CTA setup finished successfully diff --git a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh index 36bbafe7c62732806aeac96fbde7041995f1eb13..c2b5109fe8a8f190714ffd8c618f2278865f2786 100755 --- a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh +++ b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh @@ -43,7 +43,7 @@ sudo -E bash -c 'cat gitScripts/bash_profile.hook >> $CTAUSERHOME/.bash_profile' sudo -u $CTAUSER cp tigConf/tigrc $CTAUSERHOME/.tigrc echo Installing minimal tools and tape tools -sudo yum install -y git cmake rpm-build gcc gcc-c++ vim gdb cgdb strace ltrace screen tig lsscsi mt-st mtx sg3_utils jq psmisc yum-plugin-versionlock krb5-workstation wget yum-utils epel-release +sudo yum install -y git cmake cmake3 rpm-build gcc gcc-c++ vim gdb cgdb strace ltrace screen tig lsscsi mt-st mtx sg3_utils jq psmisc yum-plugin-versionlock krb5-workstation wget yum-utils epel-release echo "Getting CTA sources for $CTAUSER..." sudo -u $CTAUSER bash -c 'cd ~ ; git clone https://gitlab.cern.ch/cta/CTA.git'