From d061286655e0c7e51046e4b9b72a24288d5fde5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 30 Apr 2024 15:35:52 +0200 Subject: [PATCH 1/3] c9s: Point image-c9s to image-rhel-9.4 --- image-c9s.yaml | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) mode change 100644 => 120000 image-c9s.yaml diff --git a/image-c9s.yaml b/image-c9s.yaml deleted file mode 100644 index 43122446..00000000 --- a/image-c9s.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# See https://github.com/coreos/coreos-assembler/pull/298 -size: 16 - -# We default to a container image -deploy-via-container: true - -# Disable networking by default on firstboot. We can drop this once cosa stops -# defaulting to `ip=dhcp,dhcp6 rd.neednet=1` when it doesn't see this key. -ignition-network-kcmdline: [] - -# add the requisite OCP metadata to our container image -# but xref https://github.com/openshift/os/issues/1047 -ostree-container-inject-openshift-cvo-labels: true - -# vmware-secure-boot changes the EFI secure boot option. -# set false here due to https://bugzilla.redhat.com/show_bug.cgi?id=2106055 -vmware-secure-boot: false - -# rhel9_64Guest requires hardware version 18 and vSphere 7.0U3 -# https://kb.vmware.com/s/article/88157 -vmware-os-type: rhel8_64Guest -# VMware hardware versions: https://kb.vmware.com/s/article/1003746 -# Supported VMware versions: https://lifecycle.vmware.com/ -vmware-hw-version: 15 - -# see https://github.com/coreos/coreos-assembler/pull/3607 -# Defaults for AWS -aws-imdsv2-only: false -aws-volume-type: "gp2" -aws-x86-boot-mode: "legacy-bios" diff --git a/image-c9s.yaml b/image-c9s.yaml new file mode 120000 index 00000000..3abbf78c --- /dev/null +++ b/image-c9s.yaml @@ -0,0 +1 @@ +image-rhel-9.4.yaml \ No newline at end of file From 1850d4703fce332a0fa5ebf5628368dd144ef57f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 30 Apr 2024 17:47:10 +0200 Subject: [PATCH 2/3] c9s: Use RPMs from 9.4 RHAOS repo --- ci/prow-entrypoint.sh | 6 +++--- manifest-c9s.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh index dc0a1402..4ab3f8f3 100755 --- a/ci/prow-entrypoint.sh +++ b/ci/prow-entrypoint.sh @@ -89,9 +89,9 @@ prepare_repos() { *) # Assume C9S/SCOS if the version does not match known values for RHEL # Temporary workaround until we have all packages for SCOS - curl --fail -L "http://base-${ocpver_mut}-rhel92.ocp.svc.cluster.local" -o "src/config/tmp.repo" - awk '/rhel-9.2-server-ose-4.16/,/^$/' "src/config/tmp.repo" > "src/config/ocp90.repo" - cat src/config/ocp90.repo + curl --fail -L "http://base-${ocpver_mut}-rhel94.ocp.svc.cluster.local" -o "src/config/tmp.repo" + awk '/rhel-9.4-server-ose-4.16/,/^$/' "src/config/tmp.repo" > "src/config/ocp.repo" + cat src/config/ocp.repo rm "src/config/tmp.repo" ;; esac diff --git a/manifest-c9s.yaml b/manifest-c9s.yaml index b05696c6..f3a1cd27 100644 --- a/manifest-c9s.yaml +++ b/manifest-c9s.yaml @@ -27,7 +27,7 @@ repos: # CentOS Cloud SIG repo for cri-o, cri-tools and conmon-rs - sig-cloud-okd # Include RHCOS 9 repo for oc, hyperkube - - rhel-9.2-server-ose-4.16 + - rhel-9.4-server-ose-4.16 # We include hours/minutes to avoid version number reuse automatic-version-prefix: "416.9." From 76fb706036c0439ba6f74d14460cc79d8d9ea037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 30 Apr 2024 15:23:40 +0200 Subject: [PATCH 3/3] Revert "c9s.repo: temporarily use mirrored repos" This reverts commit 88e41a0fef0dbe8e0b2d103cadd37217c8cd0933. --- c9s.repo | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/c9s.repo b/c9s.repo index 9d9e5c05..a9ba5128 100644 --- a/c9s.repo +++ b/c9s.repo @@ -1,8 +1,6 @@ [baseos] name=CentOS Stream 9 - BaseOS -baseurl=http://mirror.stream.centos.org/9-stream/BaseOS/$basearch/os -# Revert back to this once rhel-9.4 has been weaned off c9s -#baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/BaseOS/$basearch/os +baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/BaseOS/$basearch/os gpgcheck=1 repo_gpgcheck=0 enabled=1 @@ -10,9 +8,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Officia [appstream] name=CentOS Stream 9 - AppStream -baseurl=http://mirror.stream.centos.org/9-stream/AppStream/$basearch/os -# Revert back to this once rhel-9.4 has been weaned off c9s -#baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/AppStream/$basearch/os +baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/AppStream/$basearch/os gpgcheck=1 repo_gpgcheck=0 enabled=1 @@ -28,9 +24,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Ext [nfv] name=CentOS Stream 9 - NFV -baseurl=http://mirror.stream.centos.org/9-stream/NFV/$basearch/os -# Revert back to this once rhel-9.4 has been weaned off c9s -#baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/NFV/$basearch/os +baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/NFV/$basearch/os gpgcheck=1 repo_gpgcheck=0 enabled=1 @@ -38,9 +32,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Officia [rt] name=CentOS Stream 9 - RT -baseurl=http://mirror.stream.centos.org/9-stream/RT/$basearch/os -# Revert back to this once rhel-9.4 has been weaned off c9s -#baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/RT/$basearch/os +baseurl=https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/RT/$basearch/os gpgcheck=1 repo_gpgcheck=0 enabled=1