From a6d1a8d16ce24581d9e446d89ae80e73bc0b117e Mon Sep 17 00:00:00 2001
From: Julien Leduc <julien.leduc@cern.ch>
Date: Tue, 28 Jun 2022 18:16:22 +0200
Subject: [PATCH] Resolve "Fix eos5 currently failing CI schedules"
---
.../cc7/etc/yum/pluginconf.d/versionlock.list | 29 ++++++++++---------
.../cc7/opt/run/bin/start_quarkdb.sh | 11 +++++++
2 files changed, 26 insertions(+), 14 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 43dccfccc4..323555ecd9 100644
--- a/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list
+++ b/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list
@@ -17,20 +17,21 @@
0:eos-xrootd-debuginfo-4.12.8-1.el7.cern.*
#### EOS-4-END ####
#### EOS-5-START ####
-#0:eos-archive-5.0.23-1.el7.cern.x86_64.rpm
-#0:eos-cleanup-5.0.23-1.el7.cern.x86_64.rpm
-#0:eos-client-5.0.23-1.el7.cern.x86_64.rpm
-#0:eos-fuse-5.0.23-1.el7.cern.x86_64.rpm
-#0:eos-fuse-core-5.0.23-1.el7.cern.x86_64.rpm
-#0:eos-fuse-sysv-5.0.23-1.el7.cern.x86_64.rpm
-#0:eos-fusex-5.0.23-1.el7.cern.x86_64.rpm
-#0:eos-fusex-core-5.0.23-1.el7.cern.x86_64.rpm
-#0:eos-fusex-selinux-5.0.23-1.el7.cern.x86_64.rpm
-#0:eos-ns-inspect-5.0.23-1.el7.cern.x86_64.rpm
-#0:eos-server-5.0.23-1.el7.cern.x86_64.rpm
-#0:eos-srm-5.0.23-1.el7.cern.x86_64.rpm
-#0:eos-test-5.0.23-1.el7.cern.x86_64.rpm
-#0:eos-testkeytab-5.0.23-1.el7.cern.x86_64.rpm
+#0:eos-archive-5.0.25-1.el7.cern.x86_64.rpm
+#0:eos-cleanup-5.0.25-1.el7.cern.x86_64.rpm
+#0:eos-client-5.0.25-1.el7.cern.x86_64.rpm
+#0:eos-fuse-5.0.25-1.el7.cern.x86_64.rpm
+#0:eos-fuse-core-5.0.25-1.el7.cern.x86_64.rpm
+#0:eos-fuse-sysv-5.0.25-1.el7.cern.x86_64.rpm
+#0:eos-fusex-5.0.25-1.el7.cern.x86_64.rpm
+#0:eos-fusex-core-5.0.25-1.el7.cern.x86_64.rpm
+#0:eos-fusex-selinux-5.0.25-1.el7.cern.x86_64.rpm
+#0:eos-ns-inspect-5.0.25-1.el7.cern.x86_64.rpm
+#0:eos-server-5.0.25-1.el7.cern.x86_64.rpm
+#0:eos-srm-5.0.25-1.el7.cern.x86_64.rpm
+#0:eos-test-5.0.25-1.el7.cern.x86_64.rpm
+#0:eos-testkeytab-5.0.25-1.el7.cern.x86_64.rpm
+#0:eos-quarkdb-5.0.25-1.el7.cern.x86_64.rpm
#0:eos-xrootd-5.4.4-1.el7.cern.*
#0:eos-xrootd-debuginfo-5.4.4-1.el7.cern.*
#### EOS-5-END ####
diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/start_quarkdb.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/start_quarkdb.sh
index 25ff5a480c..1f6f21436a 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/start_quarkdb.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/start_quarkdb.sh
@@ -52,6 +52,17 @@ chown xrootd:xrootd /etc/eos.keytab.xrootd
if [ "-${CI_CONTEXT}-" == '-systemd-' ]; then
+# using xrootd server start script with eos-xrootd override...
+# we really need quarkdb start scripts...
+mkdir -p /etc/systemd/system/xrootd\@quarkdb.service.d
+cat <<EOF > /etc/systemd/system/xrootd\@quarkdb.service.d/custom.conf
+[Service]
+ExecStart=
+ExecStart=/opt/eos/xrootd/bin/xrootd -l /var/log/xrootd/xrootd.log -c /etc/xrootd/xrootd-%i.cfg -k fifo -s /var/run/xrootd/xrootd-%i.pid -n %i
+EOF
+ # apply this custom override
+ systemctl daemon-reload
+
systemctl start xrootd@quarkdb
systemctl status xrootd@quarkdb
--
GitLab