From 7c817f97ff4627798a4f3bbd48d1569801c9dcd1 Mon Sep 17 00:00:00 2001
From: Richard Bachmann <richard.bachmann@cern.ch>
Date: Wed, 8 Feb 2023 15:16:04 +0100
Subject: [PATCH] Update the Ceph repo key URLs
---
ReleaseNotes.md | 1 +
.../buildtree_runner/vmBootstrap/bootstrapCTA.sh | 2 +-
.../ctafrontend/cc7/buildtree-stage1-rpms-public/Dockerfile | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index c417c8538b..55ec5944ac 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -4,6 +4,7 @@
### Features
- cta/CTA#250 - Trim SQL query length in catalogue DB failure reason
- cta/CTA#301 - Switch from new to unique pointer in CtaReadTp to fix memory leak
+- cta/CTA#219 - Update Ceph repo public key in dev env and buildtree
### Bug Fixes
### Continuous Integration
diff --git a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh
index 788b1bedb6..65b726ae30 100755
--- a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh
+++ b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh
@@ -52,7 +52,7 @@ if [[ "$PUBLIC" == false ]] ; then
done
else
sudo wget https://public-yum.oracle.com/RPM-GPG-KEY-oracle-ol7 -O /etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
- sudo wget https://git.ceph.com/release.asc -O /etc/pki/rpm-gpg/RPM-ASC-KEY-ceph
+ sudo wget https://download.ceph.com/keys/release.asc -O /etc/pki/rpm-gpg/RPM-ASC-KEY-ceph
for i in ~/CTA/continuousintegration/docker/ctafrontend/cc7/etc/yum.repos.d-public/*.repo; do
sudo yum-config-manager --add-repo=$i
done
diff --git a/continuousintegration/docker/ctafrontend/cc7/buildtree-stage1-rpms-public/Dockerfile b/continuousintegration/docker/ctafrontend/cc7/buildtree-stage1-rpms-public/Dockerfile
index a40a21231b..de5eac7f38 100644
--- a/continuousintegration/docker/ctafrontend/cc7/buildtree-stage1-rpms-public/Dockerfile
+++ b/continuousintegration/docker/ctafrontend/cc7/buildtree-stage1-rpms-public/Dockerfile
@@ -36,7 +36,7 @@ ADD ${BASEDIR}/etc/yum /etc/yum
ADD ${BASEDIR}/etc/yum.repos.d-public /etc/yum.repos.d
RUN wget https://public-yum.oracle.com/RPM-GPG-KEY-oracle-ol7 -O /etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-RUN wget https://git.ceph.com/release.asc -O /etc/pki/rpm-gpg/RPM-ASC-KEY-ceph
+RUN wget https://download.ceph.com/keys/release.asc -O /etc/pki/rpm-gpg/RPM-ASC-KEY-ceph
RUN yum install -y \
yum-plugin-downloadonly \
--
GitLab