use rhel 9 containerd repo for rhel9 (#5492)

* test rhel 9 containerd repo * fix rocky 9.4 download link
replicatedhq · Dec 3, 2024 · f35aba1 · f35aba1
1 parent db8d737
commit f35aba1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/addons/containerd/1.6.33/Manifest b/addons/containerd/1.6.33/Manifest
@@ -12,3 +12,4 @@ yum2023 containerd
 yum2023 libzstd
 apt24 containerd
 image pause registry.k8s.io/pause:3.6
+
diff --git a/addons/containerd/template/Dockerfile.rhel9 b/addons/containerd/template/Dockerfile.rhel9
@@ -3,7 +3,7 @@ FROM rockylinux:9
 RUN echo -e "fastestmirror=1\nmax_parallel_downloads=8" >> /etc/dnf/dnf.conf
 
 RUN yum install -y yum-utils createrepo modulemd-tools epel-release
-RUN yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
+RUN yum-config-manager --add-repo https://download.docker.com/linux/rhel/docker-ce.repo
 RUN mkdir -p /packages/archives
 
 ARG VERSION

diff --git a/testgrid/specs/os-customer-common.yaml b/testgrid/specs/os-customer-common.yaml
@@ -1,7 +1,7 @@
 - id: rocky-9
   name: Rocky Linux
   version: "9.4"
-  vmimageuri: https://download.rockylinux.org/pub/rocky/9.4/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2
+  vmimageuri: https://dl.rockylinux.org/vault/rocky/9.4/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2
   preinit: |
     yum install -y --nobest nfs-utils fio container-selinux lvm2 conntrack-tools iptables-nft socat git iscsi-initiator-utils libcurl-minimal rrdtool yajl
 - id: ubuntu-2204

diff --git a/testgrid/specs/os-firstlast.yaml b/testgrid/specs/os-firstlast.yaml
@@ -32,7 +32,7 @@
 - id: rocky-9
   name: Rocky Linux
   version: "9.4"
-  vmimageuri: https://download.rockylinux.org/pub/rocky/9.4/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2
+  vmimageuri: https://dl.rockylinux.org/vault/rocky/9.4/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2
   preinit: |
     yum install -y --nobest nfs-utils fio container-selinux lvm2 conntrack-tools iptables-nft socat git iscsi-initiator-utils libcurl-minimal rrdtool yajl
 - id: centos-9

diff --git a/testgrid/specs/os-full.yaml b/testgrid/specs/os-full.yaml
@@ -40,10 +40,15 @@
   vmimageuri: https://dl.rockylinux.org/vault/rocky/9.1/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2
   preinit: |
     yum install -y --nobest nfs-utils fio container-selinux lvm2 conntrack-tools iptables-nft socat git iscsi-initiator-utils libcurl-minimal rrdtool yajl
-- id: rocky-9
+- id: rocky-94
   name: Rocky Linux
   version: "9.4"
-  vmimageuri: https://download.rockylinux.org/pub/rocky/9.4/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2
+  vmimageuri: https://dl.rockylinux.org/vault/rocky/9.4/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2
+  preinit: |
+    yum install -y --nobest nfs-utils fio container-selinux lvm2 conntrack-tools iptables-nft socat git iscsi-initiator-utils libcurl-minimal rrdtool yajl- id: rocky-9
+- name: Rocky Linux
+  version: "9.5"
+  vmimageuri: https://download.rockylinux.org/pub/rocky/9.5/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2
   preinit: |
     yum install -y --nobest nfs-utils fio container-selinux lvm2 conntrack-tools iptables-nft socat git iscsi-initiator-utils libcurl-minimal rrdtool yajl
 - id: centos-9

diff --git a/testgrid/specs/os-latest.yaml b/testgrid/specs/os-latest.yaml
@@ -27,7 +27,7 @@
 - id: rocky-9
   name: Rocky Linux
   version: "9.4"
-  vmimageuri: https://download.rockylinux.org/pub/rocky/9.4/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2
+  vmimageuri: https://dl.rockylinux.org/vault/rocky/9.4/images/x86_64/Rocky-9-GenericCloud-Base.latest.x86_64.qcow2
   preinit: |
     yum install -y --nobest nfs-utils fio container-selinux lvm2 conntrack-tools iptables-nft socat git iscsi-initiator-utils libcurl-minimal rrdtool yajl
 - id: centos-9
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,4 @@ yum2023 containerd
		yum2023 libzstd
		apt24 containerd
		image pause registry.k8s.io/pause:3.6