From 88aa1e619469bcf9ea382dd010465cbeced5942f Mon Sep 17 00:00:00 2001 From: Scott Little Date: Tue, 29 Nov 2022 16:05:14 -0500 Subject: [PATCH] fix: download_mirror.sh failure due to katacontainer The upstream rpm repo for katacontainer no longer exists. Switch to our CENGN mirror copy. Also Centos 8.5 has been vaulted, so fix those rpm repo definitions as well. Partial-Bug: 1998234 Signed-off-by: Scott Little Change-Id: I6b42f7728720c12e942f87cad1daaca1cee77646 --- .../yum.repos.d/StarlingX-Centos-8.5.repo | 24 +++++++++---------- .../StarlingX_3rd_katacontainer.repo | 8 +++++++ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.5.repo b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.5.repo index d3563c38..8f4da352 100644 --- a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.5.repo +++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.5.repo @@ -4,7 +4,7 @@ [StarlingX-C8.5.2111-BaseOS] name=StarlingX-CentOS-8.5.2111 - BaseOS -baseurl=http://mirror.centos.org/centos/8.5.2111/BaseOS/x86_64/os/ +baseurl=https://vault.centos.org/8.5.2111/BaseOS/x86_64/os/ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8 enabled=1 @@ -19,7 +19,7 @@ enabled=1 [StarlingX-C8.5.2111-AppStream] name=StarlingX-CentOS-8.5.2111 - AppStream -baseurl=http://mirror.centos.org/centos/8.5.2111/AppStream/x86_64/os/ +baseurl=https://vault.centos.org/8.5.2111/AppStream/x86_64/os/ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8 enabled=1 @@ -34,7 +34,7 @@ enabled=1 [StarlingX-C8.5.2111-HighAvailability] name=StarlingX-CentOS-8.5.2111 - HighAvailability -baseurl=http://mirror.centos.org/centos/8.5.2111/HighAvailability/x86_64/os/ +baseurl=https://vault.centos.org/8.5.2111/HighAvailability/x86_64/os/ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8 enabled=1 @@ -49,7 +49,7 @@ enabled=1 [StarlingX-C8.5.2111-PowerTools] name=StarlingX-CentOS-8.5.2111 - PowerTools -baseurl=http://mirror.centos.org/centos/8.5.2111/PowerTools/x86_64/os/ +baseurl=https://vault.centos.org/8.5.2111/PowerTools/x86_64/os/ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8 enabled=1 @@ -64,22 +64,22 @@ enabled=1 [StarlingX-C8.5.2111-centosplus] name=StarlingX-CentOS-8.5.2111 - centosplus -baseurl=http://mirror.centos.org/centos/8.5.2111/centosplus/x86_64/os/ +baseurl=https://vault.centos.org/8.5.2111/centosplus/x86_64/os/ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8 enabled=1 -# [StarlingX-C8.5.2111-centosplus-Source] -# name=StarlingX-CentOS-8.5.2111 - centosplus Source -# baseurl=https://vault.centos.org/8.5.2111/centosplus/Source/ -# gpgcheck=1 -# gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8 -# enabled=1 +[StarlingX-C8.5.2111-centosplus-Source] +name=StarlingX-CentOS-8.5.2111 - centosplus Source +baseurl=https://vault.centos.org/8.5.2111/centosplus/Source/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8 +enabled=1 [StarlingX-C8.5.2111-extras] name=StarlingX-CentOS-8.5.2111 - extras -baseurl=http://mirror.centos.org/centos/8.5.2111/extras/x86_64/os/ +baseurl=https://vault.centos.org/8.5.2111/extras/x86_64/os/ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8 enabled=1 diff --git a/centos-mirror-tools/yum.repos.d/StarlingX_3rd_katacontainer.repo b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_katacontainer.repo index 2fa55a64..6978ff02 100644 --- a/centos-mirror-tools/yum.repos.d/StarlingX_3rd_katacontainer.repo +++ b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_katacontainer.repo @@ -4,4 +4,12 @@ type=rpm-md baseurl=http://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.11/CentOS_7/ gpgcheck=1 gpgkey=http://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.11/CentOS_7/repodata/repomd.xml.key +enabled=0 + +[CENGN_katacontainers_releases_x86_64_stable-1.11] +name=Branch project for Kata Containers branch stable-1.11 (CentOS_7) +type=rpm-md +baseurl=http://mirror.starlingx.cengn.ca/mirror/centos/download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.11/CentOS_7/ +gpgcheck=0 enabled=1 +