From a6ba8725163a241010ca0b474dc59d45b74d2165 Mon Sep 17 00:00:00 2001 From: Julien Leduc <julien.leduc@cern.ch> Date: Wed, 8 May 2019 13:46:58 +0200 Subject: [PATCH] Upgrading to xrootd to 4.9.1-1 --- .../cc7/etc/yum/pluginconf.d/versionlock.list | 34 +++++++++---------- .../ctafrontend/cc7/opt/run/bin/client.sh | 6 ++++ .../ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh | 4 +++ 3 files changed, 27 insertions(+), 17 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 dc8c4bd299..8955aac232 100644 --- a/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list +++ b/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list @@ -12,23 +12,23 @@ 0:eos-srm-4.4.44-1.el7.cern.x86_64 0:eos-test-4.4.44-1.el7.cern.x86_64 0:eos-testkeytab-4.4.44-1.el7.cern.x86_64 -1:python2-xrootd-4.9.0-1.el7.* -1:python3-xrootd-4.9.0-1.el7.* -1:xrootd-4.9.0-1.el7.* -1:xrootd-client-4.9.0-1.el7.* -1:xrootd-client-devel-4.9.0-1.el7.* -1:xrootd-client-libs-4.9.0-1.el7.* -1:xrootd-debuginfo-4.9.0-1.el7.* -1:xrootd-devel-4.9.0-1.el7.* -1:xrootd-doc-4.9.0-1.el7.* -1:xrootd-fuse-4.9.0-1.el7.* -1:xrootd-libs-4.9.0-1.el7.* -1:xrootd-private-devel-4.9.0-1.el7.* -1:xrootd-selinux-4.9.0-1.el7.* -1:xrootd-server-4.9.0-1.el7.* -1:xrootd-server-devel-4.9.0-1.el7.* -1:xrootd-server-libs-4.9.0-1.el7.* -1:xrootd-tests-4.9.0-1.el7.* +1:python2-xrootd-4.9.1-1.el7.* +1:python3-xrootd-4.9.1-1.el7.* +1:xrootd-4.9.1-1.el7.* +1:xrootd-client-4.9.1-1.el7.* +1:xrootd-client-devel-4.9.1-1.el7.* +1:xrootd-client-libs-4.9.1-1.el7.* +1:xrootd-debuginfo-4.9.1-1.el7.* +1:xrootd-devel-4.9.1-1.el7.* +1:xrootd-doc-4.9.1-1.el7.* +1:xrootd-fuse-4.9.1-1.el7.* +1:xrootd-libs-4.9.1-1.el7.* +1:xrootd-private-devel-4.9.1-1.el7.* +1:xrootd-selinux-4.9.1-1.el7.* +1:xrootd-server-4.9.1-1.el7.* +1:xrootd-server-devel-4.9.1-1.el7.* +1:xrootd-server-libs-4.9.1-1.el7.* +1:xrootd-tests-4.9.1-1.el7.* 2:ceph-12.2.2-0.el7.x86_64 2:ceph-base-12.2.2-0.el7.x86_64 2:ceph-common-12.2.2-0.el7.x86_64 diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/client.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/client.sh index 82ac79b303..8088861add 100755 --- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/client.sh +++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/client.sh @@ -8,6 +8,12 @@ if [ ! -e /etc/buildtreeRunner ]; then # Install missing RPMs yum -y install cta-cli cta-debuginfo xrootd-client eos-client + + ## 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 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 8dbcb75f99..7c745176c8 100755 --- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh +++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh @@ -10,6 +10,10 @@ if [ ! -e /etc/buildtreeRunner ]; then # Install missing RPMs yum -y install eos-client eos-server xrootd-client xrootd-debuginfo xrootd-server cta-cli cta-debuginfo sudo logrotate + + ## 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.. + # yum -y install eos-protobuf3 fi # create local users as the mgm is the only one doing the uid/user/group mapping in the full infrastructure -- GitLab