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.

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 RHEL 9.4 Variant #1378

Merged
merged 1 commit into from
Oct 4, 2023
Merged

Conversation

marmijo
Copy link
Contributor

@marmijo marmijo commented Oct 2, 2023

Add the following files to support a RHEL 9.4 variant.

  • manifest-rhel-9.4.yaml
  • image-rhel-9.4.yaml -> image-rhel-coreos-9.yaml
  • extensions-rhel-9.4.yaml -> extensions-rhel-coreos-9.yaml

See: https://issues.redhat.com/browse/COS-2476

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 2, 2023
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 2, 2023
@marmijo marmijo marked this pull request as draft October 2, 2023 21:39
@travier
Copy link
Member

travier commented Oct 3, 2023

  • Missing an extensions manifest.
  • If the image.yaml is the same one as the other one then you can make it a symlink.

packages:
# We include the generic release package and tweak the os-release info in a
# post-proces script
- redhat-release
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- redhat-release
- centos(stream?)-release

# See: https://projects.engineering.redhat.com/browse/COREOS-1029
. /etc/os-release
cat > /etc/motd <<EOF
CentOS Stream CoreOS $VERSION
Copy link
Member

@travier travier Oct 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
CentOS Stream CoreOS $VERSION
Red Hat Enterprise Linux CoreOS $VERSION

Let's fake the name.

. /etc/os-release
cat > /etc/motd <<EOF
CentOS Stream CoreOS $VERSION
Part of OKD ${OPENSHIFT_VERSION}, SCOS is a Kubernetes native operating system
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Part of OKD ${OPENSHIFT_VERSION}, SCOS is a Kubernetes native operating system
Part of OpenShift ${OPENSHIFT_VERSION}, RHCOS is a Kubernetes native operating system

. /etc/os-release
cat > /usr/lib/os-release <<EOF
NAME="${NAME} CoreOS"
ID="scos"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ID="scos"
ID="rhcos"

Add manifest, image, and extensions yaml files to support a new
RHEL 9.4 Variant.
@marmijo marmijo changed the title WIP: Add RHEL 9.4 Variant Add RHEL 9.4 Variant Oct 3, 2023
@marmijo marmijo marked this pull request as ready for review October 3, 2023 18:38
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 3, 2023
@marmijo
Copy link
Contributor Author

marmijo commented Oct 3, 2023

Thanks! I forced pushed an update based on the review.

Comment on lines +25 to +32
- rhel-9.2-server-ose-4.15

# We include hours/minutes to avoid version number reuse
automatic-version-prefix: "415.94.<date:%Y%m%d%H%M>"
# This ensures we're semver-compatible which OpenShift wants
automatic-version-suffix: "-"
# Keep this is sync with the version in postprocess
mutate-os-release: "4.15"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I also change this to target 4.14 instead of 4.15?

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 3, 2023

@marmijo: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@travier
Copy link
Member

travier commented Oct 4, 2023

This branch is 4.15 so let's keep that.

Copy link
Member

@travier travier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 4, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 4, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: marmijo, travier

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot merged commit b2cf889 into openshift:master Oct 4, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants