From 56d96045e81e2e52c3cebf0c9afcd50d433d0527 Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Fri, 2 Feb 2018 16:14:12 +0100
Subject: [PATCH] [kill-bash] Reinstates cta-cli.conf to client pod as well as
cli pod
---
.../docker/ctafrontend/cc7/opt/run/bin/client.sh | 6 ++++++
continuousintegration/orchestration/tests/client_ar.sh | 1 -
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/client.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/client.sh
index da151f0ca5..6a629b668c 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/client.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/client.sh
@@ -10,5 +10,11 @@ if [ ! -e /etc/buildtreeRunner ]; then
yum -y install cta-cli cta-debuginfo xrootd-client eos-client
fi
+cat <<EOF > /etc/cta/cta-cli.conf
+# The CTA frontend address in the form <FQDN>:<TCPPort>
+# solved by kubernetes DNS server so KIS...
+ctafrontend:10955
+EOF
+
# sleep forever but exit immediately when pod is deleted
exec /bin/bash -c "trap : TERM INT; sleep infinity & wait"
diff --git a/continuousintegration/orchestration/tests/client_ar.sh b/continuousintegration/orchestration/tests/client_ar.sh
index 3b99ee453a..96aa0f93c0 100644
--- a/continuousintegration/orchestration/tests/client_ar.sh
+++ b/continuousintegration/orchestration/tests/client_ar.sh
@@ -201,7 +201,6 @@ if [[ $REMOVE == 1 ]]; then
echo "Got cta admin privileges, can proceed with the workflow"
else
# displays what failed and fail
- cat /etc/cta/cta-cli.conf
admin_cta admin ls
die "Could not launch cta-admin command."
fi
--
GitLab