Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NO-JIRA: c9s: Small fixes #1501

Merged
merged 3 commits into from
May 8, 2024
Merged

NO-JIRA: c9s: Small fixes #1501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d061286
c9s: Point image-c9s to image-rhel-9.4
travier Apr 30, 2024
1850d47
c9s: Use RPMs from 9.4 RHAOS repo
travier Apr 30, 2024
76fb706
Revert "c9s.repo: temporarily use mirrored repos"
travier Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions c9s.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
[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
gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official

[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
Expand All @@ -28,19 +24,15 @@ 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
gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official

[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
Expand Down
6 changes: 3 additions & 3 deletions ci/prow-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 0 additions & 30 deletions image-c9s.yaml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions image-c9s.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
image-rhel-9.4.yaml
2 changes: 1 addition & 1 deletion manifest-c9s.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.<date:%Y%m%d%H%M>"
Expand Down