Closed jlebon closed 1 month ago
I've tested this on master (RHCOS and SCOS variants), release-4.15 (RHCOS), and release-4.14 (RHCOS).
/lgtm /approve
[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
@jlebon: all tests passed!
Full PR test history. Your PR dashboard.
@jlebon: This pull request explicitly references no jira issue.
/cherrypick release-4.15 release 4.14
@jlebon: #1506 failed to apply on top of branch "release-4.15":
Applying: denylist: drop ext.config.rpm-ostree.replace-rt-kernel
Using index info to reconstruct a base tree...
M kola-denylist.yaml
Falling back to patching base and 3-way merge...
Auto-merging kola-denylist.yaml
CONFLICT (content): Merge conflict in kola-denylist.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 denylist: drop ext.config.rpm-ostree.replace-rt-kernel
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
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 likert
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:
Closes: #1383