NO-JIRA: variants: simplify #1502
Conversation
openshift-ci
bot
added
the
approved
|
CI fixes in openshift/release#51750 |
At this point, we're pretty committed to RHEL 9.4 and it's very unlikely that we'll revert back to RHEL 9.2. If we do, we can just revert this PR. This variant isn't even building right now in the pipeline so there's no attention paid to it and no point in carrying it.
Since we have multiple repos at play here, a naked `baseos` repo name is ambiguous. Let's add a `c9s-` prefix to make it consistent with the RHEL ones, e.g. `rhel-9.4-baseos`.
This repo is really confusing to work with because of all the various tiers of variants we have. In practice, our production pipelines always specify a concrete variant to build because the switchover between e.g. 9.2 and 9.4 happens on the ART side, not RHCOS side. And even in CI, since the script that gets called by Prow lives here, we can easily control which concrete variant gets built. So overall, we don't gain much from trying to have symbolic versionless variants, but it adds cognitive overhead trying to understand it all. This patch greatly simplifies things by getting rid of the `scos` and `rhel-coreos-9` variants. Now, we *only* have concrete variants. Document them in the README. The only symbolic links left are the canonical variantless ones, which determine the default variant that gets built if no `--variant` switch is passed to `cosa init`. This is also prep for openshift#799, which will add more concrete variants that do not bake in the OpenShift components.
|
/retest |
2 similar comments
|
/retest |
|
/retest |
openshift-ci
bot
added
lgtm
|
@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. |
openshift-ci-robot
added
the
jira/valid-reference
There's a messy situation right now where the containers-common package is higher versioned in OCP than in c9s proper. And because we need the OCP repo for now to compose SCOS, we get the OCP one, which causes issues because unlike the c9s version, it doesn't ship the RHEL keys. Work around this by pinning containers-common to the c9s-appstream repo. While we're here, improve error-handling so that we output stderr if podman fails. See also: openshift#1505 (comment) Fixes: openshift#1505
|
@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. |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dustymabe, jlebon, marmijo 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 |
|
some fallout from this is that older branches |
This repo is really confusing to work with because of all the various
tiers of variants we have.
In practice, our production pipelines always specify a concrete variant
to build because the switchover between e.g. 9.2 and 9.4 happens on the
ART side, not RHCOS side. And even in CI, since the script that gets
called by Prow lives here, we can easily control which concrete variant
gets built.
So overall, we don't gain much from trying to have symbolic versionless
variants, but it adds cognitive overhead trying to understand it all.
This patch greatly simplifies things by getting rid of the
scosandrhel-coreos-9variants. Now, we only have concrete variants.Document them in the README.
The only symbolic links left are the canonical variantless ones, which
determine the default variant that gets built if no
--variantswitchis passed to
cosa init.This is also prep for #799, which will add more concrete variants that
do not bake in the OpenShift components.