From ddff9fc43a084ec5ffbcce453c983e042e2b9834 Mon Sep 17 00:00:00 2001 From: Julien Leduc <julien.leduc@cern.ch> Date: Sun, 29 Mar 2020 22:09:30 +0200 Subject: [PATCH] removing older ceph repos and updating radosVersion --- .../ctafrontend/cc7/etc/yum.repos.d/cta-ci.repo | 13 +++---------- cta.spec.in | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/continuousintegration/docker/ctafrontend/cc7/etc/yum.repos.d/cta-ci.repo b/continuousintegration/docker/ctafrontend/cc7/etc/yum.repos.d/cta-ci.repo index 9d6003a5c1..ca9aa43c5c 100644 --- a/continuousintegration/docker/ctafrontend/cc7/etc/yum.repos.d/cta-ci.repo +++ b/continuousintegration/docker/ctafrontend/cc7/etc/yum.repos.d/cta-ci.repo @@ -5,16 +5,9 @@ priority=2 gpgcheck=0 enabled=1 -[cta-ci-ceph] -name=CTA CI repo ceph cache -baseurl=https://cta-ci-repo.web.cern.ch/cta-ci-repo/ceph/ -priority=3 -gpgcheck=0 -enabled=1 - -[cta-ci-ceph-luminous] -name=CTA CI repo ceph-luminous cache to prevent automatic upgrade of branches with no ceph versionlock -baseurl=https://cta-ci-repo.web.cern.ch/cta-ci-repo/ceph-luminous +[cta-ci-ceph-nautilus] +name=CTA CI repo ceph-nautilus cache +baseurl=https://cta-ci-repo.web.cern.ch/cta-ci-repo/ceph-nautilus priority=3 gpgcheck=0 enabled=1 diff --git a/cta.spec.in b/cta.spec.in index 947463644b..72f0fd204e 100644 --- a/cta.spec.in +++ b/cta.spec.in @@ -40,7 +40,7 @@ BuildRequires: cmake >= 2.6 redhat-rpm-config # The CTA client is the only component of CTA that can be compiled on both SLC6 # and C77, therefore only the packages it depends on are required for SLC6 -%define radosVersion 2:12.2.2 +%define radosVersion 2:14.2.8 BuildRequires: xrootd-client-devel >= 1:4.10.0 BuildRequires: xrootd-devel >= 1:4.10.0 BuildRequires: xrootd-server-devel >= 1:4.10.0 -- GitLab