Updates for variant & yumrepo support in COSA by travier · Pull Request #958 · openshift/os

travier · 2022-08-25T19:41:53Z

manifests: Rework symlinks to match variant support in COSA

To make the logic simpler, we're carrying the variant <-> version logic
with symlinks in this repo

See COSA support in coreos/coreos-assembler#2934

manifests: Fix 'distro' variable for C9S

kola-denylist & ci: Use COSA variant support

docs: Update for variant & yumrepo support

On top of the defaut variant, a config repo may include aditional optional variants. The variant used is selected at `cosa init` with the `--variant` option and the value is recorded locally in `src/config.json`. See: - openshift/os#852 - openshift/os#901 - openshift/os#958 Reworks: 480c239 init: Require specifying a config repository

HuijingHei · 2022-08-26T04:01:56Z

I am OK with this, just confused about the manifest.yaml -> manifest-rhel-coreos-8.yaml -> manifest-rhel-8.6.yaml, is there any concern to do this? Why not ln manifest.yaml -> manifest-rhel-8.6.yaml directly?

travier · 2022-08-26T10:21:43Z

Agree that this is confusing. I'll update the docs and add a note like below to explain.

The idea is that we want to have a default variant (no suffix) that is the one we want to build by default when you clone the repo. Right now this is the one shipped in production (built by the pipelines) but we might want to switch to SCOS at some point.

We also want explicit options to be able to work on a specific variant by specifying exact RHEL or CentOS Stream versions as variants (rhel-8.6, rhel-9.0, c9s).

But we also want to be able to track major streams/versions as we will make two pipelines, one for RHEL 8 based RHCOS and one for RHEL 9 based RHCOS (plus one for SCOS elsewhere). So we need rhel-coreos-8, rhel-coreos-9 & scos. We could even have scos-9 but we don't really need it right now.

Thus the idea behind the chain of symlinks is that we make explicit those decisions:

default points to rhel-coreos-8 as that's what we have supported in the pipelines for now but we might switch to SCOS once we have the new pipelines ready
rhel-coreos-8 & rhel-coreos-9 point to the current minor version that we want to ship in the new pipelines

On top of the defaut variant, a config repo may include aditional optional variants. The variant used is selected at `cosa init` with the `--variant` option and the value is recorded locally in `src/config.json`. See: - openshift/os#852 - openshift/os#901 - openshift/os#958 Reworks: 480c239 init: Require specifying a config repository

jlebon

LGTM! Thanks a lot for updating the docs.

jlebon · 2022-08-26T15:15:14Z

        "rhcos-cosa-prow-pr-ci")
            setup_user
-            cosa_init
+            cosa_init "rhel-coreos-8"


Bikeshed: WDYT about rhcos8 and rhcos9 instead? Seems closer to what we're used to type and matches the other scos better too.

See coreos/coreos-assembler#2934 (comment)

I agree typing rhcos is more convenient in quick emails and interactive chat. But for anything a bit more formal I'd like to move to being more explicit because the world can only have so many acronyms. "rhel-coreos" is not that much longer and is much, much more self-describing, even though it still contains one acronym.

I suppose a counterargument is the plethora of rhcos- in https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.11/latest/ ...but...we can change that.

We've started using rhel-coreos-8 & rhel-coreos-9 for the machine-os-content & container names somewhere but I don't remember exactly where thus the change here.

https://github.com/openshift/release/blob/master/ci-operator/config/openshift/os/openshift-os-master__periodic.yaml#L101

I think my core argument here is: With the introduction of RHEL9, the abbreviation "rhcos" has become ambiguous outside of the most generic contexts. Specifically, mirror.openshift.com for example can't just use rhcos - it has to become either rhcos8 and rhcos9 as you suggest, but I think while we are renaming things, let's use rhel-coreos-8 and rhel-coreos-9 there and in our disk images in general.

No strong argument against rhel-coreos-N, but note that RHCOS as an acronym is pretty established at this point, including in official OpenShift docs. We do need to start adding the version string, but I'm not sure it follows that we need to also change the prefix.

On top of the defaut variant, a config repo may include aditional optional variants. The variant used is selected at `cosa init` with the `--variant` option and the value is recorded locally in `src/config.json`. See: - openshift/os#852 - openshift/os#901 - openshift/os#958 Reworks: 480c239 init: Require specifying a config repository

jlebon · 2022-08-26T17:06:21Z

I think we need to force a rebuild of the layered cosa image.

/retest all

openshift-ci · 2022-08-26T17:06:24Z

@jlebon: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

/test images
/test periodic-images
/test rhcos-86-build-test-metal
/test rhcos-86-build-test-qemu
/test rhcos-90-build-test-metal
/test rhcos-90-build-test-qemu
/test scos-9-build-test-metal
/test scos-9-build-test-qemu
/test validate

Use /test all to run all jobs.

Details

In response to this:

I think we need to force a rebuild of the layered cosa image.

/retest all

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.

jlebon · 2022-08-26T17:06:58Z

/test images

jlebon · 2022-08-26T17:08:03Z

/retest

jlebon · 2022-08-26T17:11:10Z

/retest

jlebon · 2022-08-26T17:17:16Z

CI failure looks legit now.

On top of the defaut variant, a config repo may include aditional optional variants. The variant used is selected at `cosa init` with the `--variant` option and the value is recorded locally in `src/config.json`. See: - openshift/os#852 - openshift/os#901 - openshift/os#958 Reworks: 480c239 init: Require specifying a config repository

travier · 2022-08-29T09:49:03Z

/test images

travier · 2022-08-29T10:03:48Z

/retest

travier · 2022-08-29T10:31:13Z

/test images

travier · 2022-08-29T10:39:40Z

/retest

travier · 2022-08-29T15:58:04Z

/test images

travier · 2022-08-29T17:53:05Z

/test images
/retest

travier · 2022-08-30T10:14:33Z

/test images
/retest

To make the logic simpler, we're carrying the variant <-> version logic with symlinks in this repo See COSA support in coreos/coreos-assembler#2934

- Use a single kola denylist - Remove setup variant workarounds - Use an explicit variant for all test jobs - Use the variant info to fetch the right repos

cgwalters · 2022-08-30T20:43:48Z

The failing tests look like flakes to me offhand.
/retest

cgwalters · 2022-08-31T01:24:05Z

/retest

cgwalters · 2022-08-31T01:24:10Z

/lgtm

openshift-ci · 2022-08-31T01:24:42Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, jlebon, travier

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [cgwalters,jlebon,travier]

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

openshift-ci · 2022-08-31T06:05:18Z

@travier: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

openshift-ci Bot requested review from HuijingHei and aaradhak August 25, 2022 19:42

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 25, 2022

travier mentioned this pull request Aug 25, 2022

Add variant support coreos/coreos-assembler#2934

Merged

travier force-pushed the cosa-variant branch from dd84aab to ef58f30 Compare August 26, 2022 11:27

travier changed the title ~~manifests: Rework symlinks to match variant support in COSA~~ Update for variant & yumrepo support in COSA Aug 26, 2022

travier changed the title ~~Update for variant & yumrepo support in COSA~~ Updatesfor variant & yumrepo support in COSA Aug 26, 2022

travier changed the title ~~Updatesfor variant & yumrepo support in COSA~~ Updates for variant & yumrepo support in COSA Aug 26, 2022

travier mentioned this pull request Aug 26, 2022

Add support for copying yum repos from separate git repo coreos/coreos-assembler#3036

Merged

jlebon approved these changes Aug 26, 2022

View reviewed changes

travier force-pushed the cosa-variant branch from c2e5777 to 3a27213 Compare August 26, 2022 16:35

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 29, 2022

travier force-pushed the cosa-variant branch from 3a27213 to 46bf72e Compare August 29, 2022 20:48

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 29, 2022

travier added 2 commits August 30, 2022 15:58

manifests: Rework symlinks to match variant support in COSA

f2e3139

To make the logic simpler, we're carrying the variant <-> version logic with symlinks in this repo See COSA support in coreos/coreos-assembler#2934

manifests: Add osversion for usage in kola denylist

f7f59f4

travier force-pushed the cosa-variant branch 2 times, most recently from 17ca171 to 60b1a8c Compare August 30, 2022 15:27

travier added 2 commits August 30, 2022 18:38

kola-denylist & ci: Use COSA variant/osversion support

8891843

- Use a single kola denylist - Remove setup variant workarounds - Use an explicit variant for all test jobs - Use the variant info to fetch the right repos

docs: Update for variant & yumrepo support

a14b2a8

travier force-pushed the cosa-variant branch from 60b1a8c to a14b2a8 Compare August 30, 2022 16:38

openshift-ci Bot assigned cgwalters Aug 31, 2022

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 31, 2022

openshift-merge-robot merged commit 01b7b0b into openshift:master Aug 31, 2022

travier deleted the cosa-variant branch August 31, 2022 10:09

Conversation

travier commented Aug 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

HuijingHei commented Aug 26, 2022

Uh oh!

travier commented Aug 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jlebon left a comment

Choose a reason for hiding this comment

Uh oh!

jlebon Aug 26, 2022

Choose a reason for hiding this comment

Uh oh!

cgwalters Aug 26, 2022

Choose a reason for hiding this comment

Uh oh!

cgwalters Aug 26, 2022

Choose a reason for hiding this comment

Uh oh!

cgwalters Aug 26, 2022

Choose a reason for hiding this comment

Uh oh!

travier Aug 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

travier Aug 26, 2022

Choose a reason for hiding this comment

Uh oh!

cgwalters Aug 26, 2022

Choose a reason for hiding this comment

Uh oh!

jlebon Aug 26, 2022

Choose a reason for hiding this comment

Uh oh!

jlebon commented Aug 26, 2022

Uh oh!

openshift-ci Bot commented Aug 26, 2022

Uh oh!

jlebon commented Aug 26, 2022

Uh oh!

jlebon commented Aug 26, 2022

Uh oh!

jlebon commented Aug 26, 2022

Uh oh!

jlebon commented Aug 26, 2022

Uh oh!

travier commented Aug 29, 2022

Uh oh!

travier commented Aug 29, 2022

Uh oh!

travier commented Aug 29, 2022

Uh oh!

travier commented Aug 29, 2022

Uh oh!

travier commented Aug 29, 2022

Uh oh!

travier commented Aug 29, 2022

Uh oh!

travier commented Aug 30, 2022

Uh oh!

cgwalters commented Aug 30, 2022

Uh oh!

cgwalters commented Aug 31, 2022

Uh oh!

cgwalters commented Aug 31, 2022

Uh oh!

openshift-ci Bot commented Aug 31, 2022

Uh oh!

openshift-ci Bot commented Aug 31, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

travier commented Aug 25, 2022 •

edited

Loading

travier commented Aug 26, 2022 •

edited

Loading

travier Aug 26, 2022 •

edited

Loading