From eca00865c331a7cf9e6c3807f60e6a990d87d46a Mon Sep 17 00:00:00 2001
From: Julien Leduc <julien.leduc@cern.ch>
Date: Mon, 4 May 2020 16:42:21 +0200
Subject: [PATCH] [eos] Upgrade eos to 4.7.12 and modify space initialization
 for new constraints.

---
 .../cc7/etc/yum/pluginconf.d/versionlock.list | 30 +++++++++----------
 .../ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh |  5 ++++
 2 files changed, 20 insertions(+), 15 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 2c40135b8b..d03d75e9a0 100644
--- a/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list
+++ b/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list
@@ -1,18 +1,18 @@
-0:eos-archive-4.7.10-1.el7.cern.x86_64
-0:eos-cleanup-4.7.10-1.el7.cern.x86_64
-0:eos-client-4.7.10-1.el7.cern.x86_64
-0:eos-debuginfo-4.7.10-1.el7.cern.x86_64
-0:eos-fuse-4.7.10-1.el7.cern.x86_64
-0:eos-fuse-core-4.7.10-1.el7.cern.x86_64
-0:eos-fuse-sysv-4.7.10-1.el7.cern.x86_64
-0:eos-fusex-4.7.10-1.el7.cern.x86_64
-0:eos-fusex-core-4.7.10-1.el7.cern.x86_64
-0:eos-fusex-selinux-4.7.10-1.el7.cern.x86_64
-0:eos-ns-inspect-4.7.10-1.el7.cern.x86_64
-0:eos-server-4.7.10-1.el7.cern.x86_64
-0:eos-srm-4.7.10-1.el7.cern.x86_64
-0:eos-test-4.7.10-1.el7.cern.x86_64
-0:eos-testkeytab-4.7.10-1.el7.cern.x86_64
+0:eos-archive-4.7.12-1.el7.cern.x86_64
+0:eos-cleanup-4.7.12-1.el7.cern.x86_64
+0:eos-client-4.7.12-1.el7.cern.x86_64
+0:eos-debuginfo-4.7.12-1.el7.cern.x86_64
+0:eos-fuse-4.7.12-1.el7.cern.x86_64
+0:eos-fuse-core-4.7.12-1.el7.cern.x86_64
+0:eos-fuse-sysv-4.7.12-1.el7.cern.x86_64
+0:eos-fusex-4.7.12-1.el7.cern.x86_64
+0:eos-fusex-core-4.7.12-1.el7.cern.x86_64
+0:eos-fusex-selinux-4.7.12-1.el7.cern.x86_64
+0:eos-ns-inspect-4.7.12-1.el7.cern.x86_64
+0:eos-server-4.7.12-1.el7.cern.x86_64
+0:eos-srm-4.7.12-1.el7.cern.x86_64
+0:eos-test-4.7.12-1.el7.cern.x86_64
+0:eos-testkeytab-4.7.12-1.el7.cern.x86_64
 0:eos-xrootd-4.11.3-1.el7.cern.*
 0:eos-xrootd-debuginfo-4.11.3-1.el7.cern.*
 1:python2-xrootd-4.11.3-1.el7.*
diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh
index 61f5c9ff86..c2195e3769 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh
@@ -220,6 +220,10 @@ fi
   eos vid enable krb5
   eos vid enable sss
   eos vid enable unix
+
+  # define space default before adding first fs
+  eos space define default
+
   EOS_MGM_URL="root://${eoshost}" eosfstregister -r /fst default:1
 
   # Add user daemon to sudoers this is to allow recalls for the moment using this command
@@ -235,6 +239,7 @@ fi
   eos attr -r set default=replica /eos
   eos attr -r set sys.forced.nstripes=1 /eos
 
+  eos space define tape
   eos fs add -m ${TAPE_FS_ID} tape localhost:1234 /does_not_exist tape
   eos mkdir ${CTA_PROC_DIR}
   eos mkdir ${CTA_WF_DIR}
-- 
GitLab