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

COS-2959: Add rhel-9.6 and ocp-rhel-9.6 variants #1629

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

jbtrystram
Copy link
Contributor

Right now these are pure centOS Stream 9 builds with a spoofed os-release file.

For the ocp variant, pull the packages from the 9.4-4.18 repos.

https://issues.redhat.com/browse/COS-2959

Copy link
Contributor

openshift-ci bot commented Oct 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jbtrystram

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 2, 2024
@jbtrystram jbtrystram force-pushed the add-rhel-9.6-variant branch 2 times, most recently from 0e00216 to 70ea386 Compare October 2, 2024 16:55
ci/prow-entrypoint.sh Show resolved Hide resolved
manifest-rhel-9.6.yaml Outdated Show resolved Hide resolved
Comment on lines 41 to 67
cat > /usr/lib/os-release <<EOF
NAME="Red Hat Enterprise Linux"
VERSION="9.6 (Plow)"
ID="rhel"
ID_LIKE="fedora"
VERSION="${OSTREE_VERSION}"
VARIANT="CoreOS"
VARIANT_ID=coreos
VERSION_ID="9.6"
PLATFORM_ID="platform:el9"
PRETTY_NAME="${NAME} CoreOS ${OSTREE_VERSION}"
ANSI_COLOR="0;31"
LOGO="fedora-logo-icon"
CPE_NAME="cpe:/o:redhat:enterprise_linux:9::coreos"
HOME_URL="https://www.redhat.com/"
DOCUMENTATION_URL="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9"
BUG_REPORT_URL="https://issues.redhat.com/"

REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 9"
REDHAT_BUGZILLA_PRODUCT_VERSION=9.6
REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux"
REDHAT_SUPPORT_PRODUCT_VERSION="9.6"
EOF
Copy link
Member

Choose a reason for hiding this comment

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

Can you show the resulting /etc/os-release file in the built container image/VM? Compare to https://gist.github.com/jlebon/908e45c42ce9e365fb83d7470cbbb40c for how it currently looks for rhel-9.4.

Copy link
Contributor Author

@jbtrystram jbtrystram Oct 3, 2024

Choose a reason for hiding this comment

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

I just updated to have something that matches :

NAME="Red Hat Enterprise Linux CoreOS"
VERSION="9.6.202410031540-0 (Plow)"
ID="rhel"
ID_LIKE="fedora"
VERSION="9.6.202410031540-0"
VARIANT="CoreOS"
VARIANT_ID=coreos
VERSION_ID="9.6"
PLATFORM_ID="platform:el9"
PRETTY_NAME="Red Hat Enterprise Linux CoreOS 9.6.202410031540-0 (Plow)"
ANSI_COLOR="0;31"
LOGO="fedora-logo-icon"
CPE_NAME="cpe:/o:redhat:enterprise_linux:9::baseos"
HOME_URL="https://www.redhat.com/"
DOCUMENTATION_URL="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9"
BUG_REPORT_URL="https://issues.redhat.com/"

REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 9"
REDHAT_BUGZILLA_PRODUCT_VERSION=9.6
REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux"
REDHAT_SUPPORT_PRODUCT_VERSION="9.6"
OSTREE_VERSION="9.6.202410031540-0"

@jbtrystram
Copy link
Contributor Author

/retest

@jbtrystram
Copy link
Contributor Author

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 4, 2024
@jbtrystram jbtrystram force-pushed the add-rhel-9.6-variant branch 2 times, most recently from 7de46d2 to 50c78e2 Compare October 11, 2024 14:41
Right now these are pure centOS Stream 9 builds with a spoofed
`os-release` file.

For the ocp variant, pull the packages from the 9.4-4.18 repos.

https://issues.redhat.com/browse/COS-2959
This 9.6 rhel version is faked from centOS stream 9 so those tests are
expected to fail.

See openshift#1635
This brings teamd which is a required package for `ext.confg.network.team-dhcp-via-ignition`
@mike-nguyen mike-nguyen changed the title [COS-2959] Add rhel-9.6 and ocp-rhel-9.6 variants COS-2959: Add rhel-9.6 and ocp-rhel-9.6 variants Oct 14, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 14, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 14, 2024

@jbtrystram: This pull request references COS-2959 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

In response to this:

Right now these are pure centOS Stream 9 builds with a spoofed os-release file.

For the ocp variant, pull the packages from the 9.4-4.18 repos.

https://issues.redhat.com/browse/COS-2959

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 openshift-eng/jira-lifecycle-plugin repository.

secureboot does not work on c9s for now, so as this rhel 9.6 is
just c9s, it won't either.
denylist those tests until beta.
This is the same as openshift@c95eedc
@jbtrystram
Copy link
Contributor Author

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 17, 2024
In preparation of rhel9.6 let's have prow entry points.
https://issues.redhat.com/browse/COS-2975
jbtrystram added a commit to jbtrystram/openshift-os that referenced this pull request Oct 17, 2024
Preparation work to update openshift/release jobs to build rhel 9.6
and c10s.
Needs to be merged before openshift#1629
and openshift#1498
Copy link
Contributor

openshift-ci bot commented Oct 17, 2024

@jbtrystram: 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-sigs/prow repository. I understand the commands that are listed here.

@dustymabe
Copy link
Member

is the intention to squash these commits when ready to merge?

Comment on lines +39 to +47
# as it's a fake rhel build (from c9s) versions won't match
- pattern: ext.config.version.rhel-major-version
tracker: https://github.com/openshift/os/issues/1635
osversion:
- rhel-9.6
- pattern: ext.config.shared.content-origins
tracker: https://github.com/openshift/os/issues/1635
osversion:
- rhel-9.6
Copy link
Member

Choose a reason for hiding this comment

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

can we add a snooze to these so that we don't forget to start running the test?

I wish we could do it for all of the UEFI ones above but those have c9s on them too.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants