-
Notifications
You must be signed in to change notification settings - Fork 104
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
NO-JIRA: tests/replace-rt-kernel: fix and improve #1506
NO-JIRA: tests/replace-rt-kernel: fix and improve #1506
Conversation
This should work on SCOS now.
I've tested this on master (RHCOS and SCOS variants), release-4.15 (RHCOS), and release-4.14 (RHCOS). |
It's a bit odd to have this test pull the `c9s.repo` yum repo from the master branch of openshift/os. We don't want to be in a situation where a change in master breaks older branches. But also, `c9s.repo` could at any point in time refer to either the latest compose output or the official mirrors. But we always want to use the official mirrors for this test since that has multiple package versions and we need to be able to select a kernel version which is not equal to ours. We could curl the official `centos.repo` file (and actually, in the SCOS case, it's already in the image), but that file doesn't include additional repos like `rt` and `nfv` which we need for our test. Instead, just bake the config into the test data. That way we don't need to curl anything at all, and the repo definition is naturally bound to the test and can be modified together atomically. A few additional changes: 1. only do all the repo preparations stuff on the first boot 2. add logic to pick a kernel that's different from the one we're on if we're already CentOS-based (this fixes openshift#1383) 3. add a stub for c10s for when we're ready Closes: openshift#1383
75990b6
to
15c7bf9
Compare
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.
lgtm
/lgtm |
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.
should we mention somewhere in here where we got this from and how to update it in the future?
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.
Good point. Will add a comment in a follow-up.
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.
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dustymabe, jlebon, jmarrero 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 |
@jlebon: 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. |
@jlebon: This pull request explicitly references no jira issue. In response to this:
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. |
/cherrypick release-4.15 release 4.14 |
@jlebon: #1506 failed to apply on top of branch "release-4.15":
In response to this:
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. |
Follow-up to 15c7bf9 ("tests/replace-rt-kernel: fix and improve"). This was pointed out during code review in openshift#1506.
It's a bit odd to have this test pull the
c9s.repo
yum repo from themaster branch of openshift/os. We don't want to be in a situation where
a change in master breaks older branches.
But also,
c9s.repo
could at any point in time refer to either thelatest compose output or the official mirrors. But we always want to
use the official mirrors for this test since that has multiple package
versions and we need to be able to select a kernel version which is not
equal to ours.
We could curl the official
centos.repo
file (and actually, in theSCOS case, it's already in the image), but that file doesn't include
additional repos like
rt
andnfv
which we need for our test.Instead, just bake the config into the test data. That way we don't need
to curl anything at all, and the repo definition is naturally bound to
the test and can be modified together atomically.
A few additional changes:
we're already CentOS-based (this fixes [rhel-9.4 variant]
ext.config.rpm-ostree.replace-rt-kernel
fails #1383)Closes: #1383