From fa3c403b23cc6410cc3e58a401bcb55afb2d1cda Mon Sep 17 00:00:00 2001 From: Volodymyr Yurchenko <volodymyr.yurchenko@cern.ch> Date: Mon, 31 Aug 2020 17:20:19 +0200 Subject: [PATCH] Add epel repo in case it is missing; remove ceph-internal --- .../buildtree_runner/vmBootstrap/bootstrapCTA.sh | 2 +- .../buildtree_runner/vmBootstrap/bootstrapSystem.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh index e0688da11f..111da2d9c3 100755 --- a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh +++ b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh @@ -18,7 +18,7 @@ mkdir -p ~/CTA-build-srpm (cd ~/CTA-build-srpm && cmake -DPackageOnly:Bool=true ../CTA; make cta_srpm) echo Installing repos -for r in `ls -1 ../../docker/ctafrontend/cc7/etc/yum.repos.d/*.repo` ceph-internal.repo; do +for r in `ls -1 ../../docker/ctafrontend/cc7/etc/yum.repos.d/*.repo` ; do sudo yum-config-manager --add-repo=$r done sudo yum install -y yum-plugin-priorities diff --git a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh index 277569a249..7eecb0242d 100755 --- a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh +++ b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh @@ -26,7 +26,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 mariadb-devel yum-plugin-versionlock krb5-workstation wget yum-utils +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 mariadb-devel yum-plugin-versionlock krb5-workstation wget yum-utils epel-release echo Installing Oracle instant client sudo wget https://public-yum.oracle.com/RPM-GPG-KEY-oracle-ol7 -O /etc/pki/rpm-gpg/RPM-GPG-KEY-oracle -- GitLab