From ac9841146e0221b133027a09d2b6a40304059b3e Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Tue, 20 Aug 2019 16:00:48 +0200
Subject: [PATCH] [ci] Configure migration tools in client pod
---
.../docker/ctafrontend/cc7/opt/run/bin/client.sh | 15 +++++++++++++--
.../docker/ctafrontend/cc7/opt/run/bin/init.sh | 5 +----
.../cc7/opt/run/bin/init_migration_tools.sh | 15 ---------------
3 files changed, 14 insertions(+), 21 deletions(-)
delete mode 100755 continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init_migration_tools.sh
diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/client.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/client.sh
index 05325855de..893eda66e5 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/client.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/client.sh
@@ -7,13 +7,12 @@ if [ ! -e /etc/buildtreeRunner ]; then
yum-config-manager --enable ceph
# Install missing RPMs
- yum -y install cta-cli cta-debuginfo xrootd-client eos-client jq
+ yum -y install cta-cli cta-debuginfo xrootd-client eos-client cta-migration-tools jq
## Keep this temporary fix that may be needed if going to protobuf3-3.5.1 for CTA
# Install eos-protobuf3 separately as eos is OK with protobuf3 but cannot use it..
# Andreas is fixing eos-(client|server) rpms to depend on eos-protobuf3 instead
# yum -y install eos-protobuf3
-
fi
cat <<EOF > /etc/cta/cta-cli.conf
@@ -22,6 +21,18 @@ cat <<EOF > /etc/cta/cta-cli.conf
cta.endpoint ctafrontend:10955
EOF
+cat <<EOF >/etc/cta/castor-migration.conf
+castor.db_login oracle:castor/<password>@castor
+castor.json true
+castor.max_num_connections 1
+castor.batch_size 100
+castor.prefix /castor/cern.ch
+eos.dry_run false
+eos.prefix /eos/grpc
+eos.endpoint eoscta:50051
+eos.token migrationtesttoken
+EOF
+
if [ "-${CI_CONTEXT}-" == '-nosystemd-' ]; then
# sleep forever but exit immediately when pod is deleted
exec /bin/bash -c "trap : TERM INT; sleep infinity & wait"
diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init.sh
index d2d817cfc0..4dcef3daac 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init.sh
@@ -17,7 +17,7 @@ if [ ! -e /etc/buildtreeRunner ]; then
yum-config-manager --enable ceph
# install needed packages
- yum -y install cta-objectstore-tools cta-doc mt-st mtx lsscsi sg3_utils cta-catalogueutils ceph-common oracle-instantclient-sqlplus cta-migration-tools
+ yum -y install cta-objectstore-tools cta-doc mt-st mtx lsscsi sg3_utils cta-catalogueutils ceph-common oracle-instantclient-sqlplus
yum clean packages
fi
@@ -26,9 +26,6 @@ echo "Using this configuration for library:"
cat /tmp/library-rc.sh
. /tmp/library-rc.sh
-echo "Configuring migration tools:"
-/opt/run/bin/init_migration_tools.sh
-
echo "Configuring objectstore:"
/opt/run/bin/init_objectstore.sh
. /tmp/objectstore-rc.sh
diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init_migration_tools.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init_migration_tools.sh
deleted file mode 100755
index fb918f6ebd..0000000000
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init_migration_tools.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-cat <<EOF >/etc/cta/castor-migration.conf
-castor.db_login oracle:castor/<password>@castor
-castor.json true
-castor.max_num_connections 1
-castor.batch_size 100
-castor.prefix /castor/cern.ch
-eos.dry_run false
-eos.prefix /eos/grpc
-eos.endpoint eoscta:50051
-eos.token migrationtesttoken
-EOF
-
-exit 0
--
GitLab