From 21cc8efbda10357ad35f5470e0a00d739d519ca5 Mon Sep 17 00:00:00 2001
From: Michael Davis <michael.davis@cern.ch>
Date: Fri, 2 Feb 2018 13:25:58 +0100
Subject: [PATCH] [kill-bash] Updates EOS to version
 4.2.12-20180202120141git3855655

CTA_StorageClass was hard coded. In this version it is read from the
extended attribute.
---
 .../cc7/etc/yum/pluginconf.d/versionlock.list | 28 +++++++++----------
 .../cc7/opt/run/bin/ctafrontend.sh            |  4 +--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list b/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list
index d56e017823..f08a32ac59 100644
--- a/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list
+++ b/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list
@@ -1,17 +1,17 @@
-0:eos-archive-4.2.11-20180131145554gite29d7c9.el7.cern.x86_64
-0:eos-cleanup-4.2.11-20180131145554gite29d7c9.el7.cern.x86_64
-0:eos-client-4.2.11-20180131145554gite29d7c9.el7.cern.x86_64
-0:eos-debuginfo-4.2.11-20180131145554gite29d7c9.el7.cern.x86_64
-0:eos-fuse-4.2.11-20180131145554gite29d7c9.el7.cern.x86_64
-0:eos-fuse-core-4.2.11-20180131145554gite29d7c9.el7.cern.x86_64
-0:eos-fuse-sysv-4.2.11-20180131145554gite29d7c9.el7.cern.x86_64
-0:eos-fusex-4.2.11-20180131145554gite29d7c9.el7.cern.x86_64
-0:eos-fusex-core-4.2.11-20180131145554gite29d7c9.el7.cern.x86_64
-0:eos-fusex-selinux-4.2.11-20180131145554gite29d7c9.el7.cern.x86_64
-0:eos-server-4.2.11-20180131145554gite29d7c9.el7.cern.x86_64
-0:eos-srm-4.2.11-20180131145554gite29d7c9.el7.cern.x86_64
-0:eos-test-4.2.11-20180131145554gite29d7c9.el7.cern.x86_64
-0:eos-testkeytab-4.2.11-20180131145554gite29d7c9.el7.cern.x86_64
+0:eos-archive-4.2.12-20180202120141git3855655.el7.cern.x86_64
+0:eos-cleanup-4.2.12-20180202120141git3855655.el7.cern.x86_64
+0:eos-client-4.2.12-20180202120141git3855655.el7.cern.x86_64
+0:eos-debuginfo-4.2.12-20180202120141git3855655.el7.cern.x86_64
+0:eos-fuse-4.2.12-20180202120141git3855655.el7.cern.x86_64
+0:eos-fuse-core-4.2.12-20180202120141git3855655.el7.cern.x86_64
+0:eos-fuse-sysv-4.2.12-20180202120141git3855655.el7.cern.x86_64
+0:eos-fusex-4.2.12-20180202120141git3855655.el7.cern.x86_64
+0:eos-fusex-core-4.2.12-20180202120141git3855655.el7.cern.x86_64
+0:eos-fusex-selinux-4.2.12-20180202120141git3855655.el7.cern.x86_64
+0:eos-server-4.2.12-20180202120141git3855655.el7.cern.x86_64
+0:eos-srm-4.2.12-20180202120141git3855655.el7.cern.x86_64
+0:eos-test-4.2.12-20180202120141git3855655.el7.cern.x86_64
+0:eos-testkeytab-4.2.12-20180202120141git3855655.el7.cern.x86_64
 1:python2-xrootd-4.8.0-0.rc1.el7.x86_64
 1:python3-xrootd-4.8.0-0.rc1.el7.x86_64
 1:xrootd-4.8.0-0.rc1.el7.x86_64
diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctafrontend.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctafrontend.sh
index 5cce9898bb..90ece0a057 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctafrontend.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctafrontend.sh
@@ -29,10 +29,10 @@ echo ${DATABASEURL} >/etc/cta/cta-catalogue.conf
 EOSINSTANCE=ctaeos
 
 # Wait for the keytab files to be pushed in by the creation script
-echo -n "Waiting for /etc/cta/eos.sss.keytab"
+echo -n "Waiting for /etc/cta/eos.sss.keytab."
 for ((;;)); do test -e /etc/cta/eos.sss.keytab && break; sleep 1; echo -n .; done
 echo OK
-echo -n "Waiting for /etc/cta/cta-frontend.krb5.keytab"
+echo -n "Waiting for /etc/cta/cta-frontend.krb5.keytab."
 for ((;;)); do test -e /etc/cta/cta-frontend.krb5.keytab && break; sleep 1; echo -n .; done
 echo OK
 
-- 
GitLab