Skip to content

Commit

Permalink
c9s: prefix dnf repo IDs with c9s-
Browse files Browse the repository at this point in the history
Since we have multiple repos at play here, a naked `baseos` repo name
is ambiguous. Let's add a `c9s-` prefix to make it consistent with the
RHEL ones, e.g. `rhel-9.4-baseos`.
  • Loading branch information
jlebon committed May 6, 2024
1 parent 17b5f8d commit d0dba36
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
16 changes: 8 additions & 8 deletions c9s.repo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[baseos]
[c9s-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
Expand All @@ -8,7 +8,7 @@ repo_gpgcheck=0
enabled=1
gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official

[appstream]
[c9s-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
Expand All @@ -18,15 +18,15 @@ repo_gpgcheck=0
enabled=1
gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official

[extras-common]
[c9s-extras-common]
name=CentOS Stream 9 - Extras packages
baseurl=https://mirror.stream.centos.org/SIGs/9-stream/extras/$basearch/extras-common
gpgcheck=1
repo_gpgcheck=0
enabled=1
gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Extras-SHA512

[nfv]
[c9s-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
Expand All @@ -36,7 +36,7 @@ repo_gpgcheck=0
enabled=1
gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official

[rt]
[c9s-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
Expand All @@ -46,23 +46,23 @@ repo_gpgcheck=0
enabled=1
gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official

[sig-nfv]
[c9s-sig-nfv]
name=CentOS Stream 9 - SIG NFV
baseurl=https://mirror.stream.centos.org/SIGs/9-stream/nfv/$basearch/openvswitch-2/
gpgcheck=1
repo_gpgcheck=0
enabled=1
gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-NFV

[sig-virtualization]
[c9s-sig-virtualization]
name=CentOS Stream 9 - SIG Virtualization
baseurl=https://mirror.stream.centos.org/SIGs/9-stream/virt/$basearch/kata-containers/
gpgcheck=1
repo_gpgcheck=0
enabled=1
gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Virtualization

[sig-cloud-okd]
[c9s-sig-cloud-okd]
name=CentOS Stream 9 - SIG Cloud OKD 4.15
baseurl=https://mirror.stream.centos.org/SIGs/9-stream/cloud/$basearch/okd-4.15/
gpgcheck=1
Expand Down
6 changes: 3 additions & 3 deletions extensions-c9s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# and https://github.com/coreos/fedora-coreos-tracker/issues/401

repos:
- sig-virtualization
- c9s-sig-virtualization

extensions:
# https://issues.redhat.com/browse/RFE-4177
Expand Down Expand Up @@ -55,7 +55,7 @@ extensions:
architectures:
- x86_64
repos:
- nfv
- c9s-nfv
packages:
- kernel-rt-core
- kernel-rt-kvm
Expand All @@ -71,7 +71,7 @@ extensions:
architectures:
- x86_64
repos:
- sig-virtualization
- c9s-sig-virtualization
packages:
- kata-containers
# https://issues.redhat.com/browse/COS-2402
Expand Down
14 changes: 7 additions & 7 deletions manifest-c9s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ include:

# CentOS Stream 9 repos + internal repos for now
repos:
- baseos
- appstream
- c9s-baseos
- c9s-appstream
# CentOS Extras Common repo for SIG RPM GPG keys
- extras-common
- c9s-extras-common
# CentOS NFV SIG repo for openvswitch
- sig-nfv
- c9s-sig-nfv
# CentOS Cloud SIG repo for cri-o, cri-tools and conmon-rs
- sig-cloud-okd
- c9s-sig-cloud-okd
# Include RHCOS 9 repo for oc, hyperkube
- rhel-9.4-server-ose-4.16

Expand Down Expand Up @@ -127,10 +127,10 @@ packages:
# Packages pinned to specific repos in SCOS 9
repo-packages:
# We always want the kernel from BaseOS
- repo: baseos
- repo: c9s-baseos
packages:
- kernel
- repo: appstream
- repo: c9s-appstream
packages:
# We want the one shipping in C9S, not the equivalently versioned one in RHAOS
- nss-altfiles
Expand Down

0 comments on commit d0dba36

Please sign in to comment.