From 10fe4a0b5ea23e1ecc3a216b1b18a21df24905de Mon Sep 17 00:00:00 2001
From: Volodymyr Yurchenko <volodymyr.yurchenko@cern.ch>
Date: Thu, 17 Sep 2020 09:23:44 +0200
Subject: [PATCH] Let yum-builddep install oracle client
Move oracle repo setup to bootstrapCTA
---
.../buildtree_runner/vmBootstrap/bootstrapCTA.sh | 12 +++++++++++-
.../buildtree_runner/vmBootstrap/bootstrapSystem.sh | 6 ------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh
index a64d30972f..ea7bec659f 100755
--- a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh
+++ b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh
@@ -23,11 +23,21 @@ for r in `ls -1 ~/CTA/continuousintegration/docker/ctafrontend/cc7/etc/yum.repos
done
sudo yum install -y yum-plugin-priorities
+sudo wget https://public-yum.oracle.com/RPM-GPG-KEY-oracle-ol7 -O /etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
+sudo tee /etc/yum.repos.d/oracle-instant-client.repo > /dev/null << 'EOF'
+[oracle-instant-client]
+name=Oracle instant client
+baseurl=https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
+gpgcheck=1
+enabled=0
+EOF
+
echo Adding versionlock for xrootd:
sudo cp ~/CTA/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list /etc/yum/pluginconf.d/versionlock.list
echo Installing build dependencies
-sudo yum-builddep -y ~/CTA-build-srpm/RPM/SRPMS/cta-0-1.src.rpm --nogpgcheck
+sudo yum-builddep -y ~/CTA-build-srpm/RPM/SRPMS/cta-0-1.src.rpm --nogpgcheck --enablerepo=oracle-instant-client
echo Installing mhvtl
sudo yum install -y mhvtl-utils kmod-mhvtl mhvtl-utils --enablerepo=castor
diff --git a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh
index 4de1d34ea0..1dddebcd25 100755
--- a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh
+++ b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh
@@ -28,12 +28,6 @@ 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 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
-sudo wget https://yum.oracle.com/public-yum-ol7.repo -O /etc/yum.repos.d/public-yum-ol7.repo
-sudo yum install -y --enablerepo=ol7_oracle_instantclient $(grep 'Requires: oracle' ../../../cta.spec.in | awk '{print $2}' | tr '\n' ' ')
-sudo yum-config-manager --disable ol7_*
-
echo "Getting CTA sources for $CTAUSER..."
sudo -u $CTAUSER bash -c 'cd ~ ; git clone https://gitlab.cern.ch/cta/CTA.git; cd CTA ; git submodule update --init --recursive'
--
GitLab