-
Notifications
You must be signed in to change notification settings - Fork 107
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.
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
Add initial C10S variant #1498
Open
travier
wants to merge
17
commits into
openshift:master
Choose a base branch
from
travier:c10s
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add initial C10S variant #1498
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
7ac8d35
EL9: Split containernetworking-plugins & glusterfs-fuse
travier fe57461
EL9: Include shared-el9 manifest from fedora-coreos-config
travier d1a4e25
EL9: tmp on tpmfs ready in C10S
travier 90080ac
manifests: Add initial c10s based variants
travier 8600c2c
c10s.repo: Skip GPG checks for now
travier 096234d
kola-denylist.yaml: Update for c10s variant
travier 5cc38d0
EL10: Include shared-el10 manifest from fedora-coreos-config
travier 378cc1d
ci/prow-entrypoint: Temporarily enable RHEL 9.4 repos with C10S
travier c2990a0
ci/prow-entrypoint: Add C10S test entrypoints
travier 9d0fe9d
oscontainer: runc -> crun (runc removed from C10S)
travier 6893206
extensions: Only setup repos on SCOS 9 for now
travier 634a06a
extensions: Re-indent Dockerfile
travier fb22df3
overlay.d/05rhcos: Add dracut module to install vendored gdisk
travier 63a8f06
DNM: add debug sleep
jlebon da8058e
DoNotMerge: CI changes to test C10S builds
travier 9ebfbce
DNM: Use custom repo & branch for f-c-c submodule
travier 9c0b25a
DoNotMerge: Bump f-c-c submodule
travier File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
[submodule "fedora-coreos-config"] | ||
path = fedora-coreos-config | ||
url = https://github.com/coreos/fedora-coreos-config | ||
branch = testing-devel | ||
url = https://github.com/travier/fedora-coreos-config | ||
branch = testing-devel-c10s |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
[c10s-baseos] | ||
name=CentOS Stream 10 - BaseOS | ||
baseurl=https://composes.stream.centos.org/stream-10/production/latest-CentOS-Stream/compose/BaseOS/$basearch/os | ||
gpgcheck=0 | ||
repo_gpgcheck=0 | ||
enabled=1 | ||
gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official | ||
|
||
[c10s-appstream] | ||
name=CentOS Stream 10 - AppStream | ||
baseurl=https://composes.stream.centos.org/stream-10/production/latest-CentOS-Stream/compose/AppStream/$basearch/os | ||
gpgcheck=0 | ||
repo_gpgcheck=0 | ||
enabled=1 | ||
gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official | ||
|
||
# [c10s-extras-common] | ||
# name=CentOS Stream 10 - Extras packages | ||
# baseurl=https://mirror.stream.centos.org/SIGs/10-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 | ||
|
||
[c10s-nfv] | ||
name=CentOS Stream 10 - NFV | ||
baseurl=https://composes.stream.centos.org/stream-10/production/latest-CentOS-Stream/compose/NFV/$basearch/os | ||
gpgcheck=0 | ||
repo_gpgcheck=0 | ||
enabled=1 | ||
gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official | ||
|
||
[c10s-rt] | ||
name=CentOS Stream 10 - RT | ||
baseurl=https://composes.stream.centos.org/stream-10/production/latest-CentOS-Stream/compose/RT/$basearch/os | ||
gpgcheck=0 | ||
repo_gpgcheck=0 | ||
enabled=1 | ||
gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official | ||
|
||
# [c10s-sig-nfv] | ||
# name=CentOS Stream 10 - SIG NFV | ||
# baseurl=https://mirror.stream.centos.org/SIGs/10-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 | ||
|
||
# [c10s-sig-virtualization] | ||
# name=CentOS Stream 10 - SIG Virtualization | ||
# baseurl=https://mirror.stream.centos.org/SIGs/10-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 | ||
|
||
# [c10s-sig-cloud-okd] | ||
# name=CentOS Stream 10 - SIG Cloud OKD 4.15 | ||
# baseurl=https://mirror.stream.centos.org/SIGs/10-stream/cloud/$basearch/okd-4.15/ | ||
# gpgcheck=1 | ||
# repo_gpgcheck=0 | ||
# enabled=1 | ||
# gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Cloud |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# Includes and packages only common to EL 10 (RHEL 10 & C10S) | ||
include: | ||
- fedora-coreos-config/manifests/shared-el10.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# Includes and packages only common to EL 9 (RHEL 9 & C9S) | ||
include: | ||
- fedora-coreos-config/manifests/shared-el9.yaml | ||
|
||
packages: | ||
- containernetworking-plugins | ||
# Gluster - Used for Openshift e2e gluster testcases | ||
# Reverts https://gitlab.cee.redhat.com/coreos/redhat-coreos/merge_requests/367 and add it for all arches | ||
- glusterfs-fuse | ||
|
||
postprocess: | ||
- | | ||
#!/usr/bin/env bash | ||
set -xeuo pipefail | ||
# Enable tmp-on-tmpfs by default because we don't want to have things leak | ||
# across reboots, it increases alignment with FCOS, and also fixes the | ||
# Live ISO. First, verify that RHEL is still disabling. | ||
grep -q '# RHEL-only: Disable /tmp on tmpfs' /usr/lib/systemd/system/basic.target | ||
echo '# RHCOS-only: we follow the Fedora/upstream default' >> /usr/lib/systemd/system/basic.target | ||
echo 'Wants=tmp.mount' >> /usr/lib/systemd/system/basic.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
# RPMs as operating system extensions, distinct from the base ostree commit/image | ||
# https://github.com/openshift/enhancements/blob/master/enhancements/rhcos/extensions.md | ||
# and https://github.com/coreos/fedora-coreos-tracker/issues/401 | ||
|
||
# repos: | ||
# - sig-virtualization | ||
|
||
extensions: | ||
# https://issues.redhat.com/browse/RFE-4177 | ||
# wasm: | ||
# architectures: | ||
# - x86_64 | ||
# - aarch64 | ||
# repos: | ||
# - appstream | ||
# packages: | ||
# - crun-wasm | ||
# https://github.com/coreos/fedora-coreos-tracker/issues/1504 | ||
ipsec: | ||
packages: | ||
- libreswan | ||
- NetworkManager-libreswan | ||
# https://github.com/coreos/fedora-coreos-tracker/issues/326 | ||
usbguard: | ||
packages: | ||
- usbguard | ||
kerberos: | ||
packages: | ||
- krb5-workstation | ||
- libkadm5 | ||
# https://github.com/kmods-via-containers/kmods-via-containers/issues/3 | ||
# https://gitlab.cee.redhat.com/coreos/redhat-coreos/merge_requests/866 | ||
# These are currently overlaid onto the host so that they can be bind-mounted | ||
# into build containers... in the future they should be a `development` | ||
# extension: https://github.com/openshift/machine-config-operator/pull/2143. | ||
kernel-devel: | ||
packages: | ||
- kernel-devel | ||
- kernel-headers | ||
match-base-evr: kernel | ||
# These are already in the base, so they're not OS extensions, but they're | ||
# useful to have in RPM form to install in kmod build containers. | ||
kernel: | ||
kind: development | ||
packages: | ||
- kernel | ||
- kernel-core | ||
- kernel-modules | ||
- kernel-modules-extra | ||
match-base-evr: kernel | ||
# GRPA-2822 | ||
# https://github.com/openshift/machine-config-operator/pull/1330 | ||
# https://github.com/openshift/enhancements/blob/master/enhancements/support-for-realtime-kernel.md | ||
kernel-rt: | ||
architectures: | ||
- x86_64 | ||
repos: | ||
- c10s-nfv | ||
packages: | ||
- kernel-rt-core | ||
- kernel-rt-kvm | ||
- kernel-rt-modules | ||
- kernel-rt-modules-extra | ||
- kernel-rt-devel | ||
match-base-evr: kernel | ||
# https://github.com/openshift/machine-config-operator/pull/2456 | ||
# https://github.com/openshift/enhancements/blob/master/enhancements/sandboxed-containers/sandboxed-containers-tech-preview.md | ||
# GRPA-3123 | ||
# - kata-containers | ||
# sandboxed-containers: | ||
# architectures: | ||
# - x86_64 | ||
# repos: | ||
# - sig-virtualization10 | ||
# packages: | ||
# - kata-containers | ||
# https://issues.redhat.com/browse/COS-2402 | ||
kernel-64k: | ||
architectures: | ||
- aarch64 | ||
packages: | ||
- kernel-64k-core | ||
- kernel-64k-modules | ||
- kernel-64k-modules-core | ||
- kernel-64k-modules-extra |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
extensions-c10s.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule fedora-coreos-config
updated
10 files
+0 −12 | kola-denylist.yaml | |
+3 −3 | manifest-lock.aarch64.json | |
+3 −3 | manifest-lock.ppc64le.json | |
+3 −3 | manifest-lock.s390x.json | |
+4 −4 | manifest-lock.x86_64.json | |
+2 −8 | manifests/fedora-coreos-base.yaml | |
+0 −3 | manifests/networking-tools.yaml | |
+8 −0 | manifests/shared-el10.yaml | |
+7 −0 | manifests/shared-el9.yaml | |
+0 −1 | manifests/user-experience.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
image-rhel-9.4.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
image-c10s.yaml |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This repo doesn't exist yet, but let's point it at 4.17 already. I'll set up the repo in the coming days.