Skip to content

manifests: Prepare for variant support in COSA and add RHEL 9.0 & SCOS variants#901

Merged
openshift-merge-robot merged 4 commits intoopenshift:masterfrom
travier:scos4
Jul 20, 2022
Merged

manifests: Prepare for variant support in COSA and add RHEL 9.0 & SCOS variants#901
openshift-merge-robot merged 4 commits intoopenshift:masterfrom
travier:scos4

Conversation

@travier
Copy link
Copy Markdown
Member

@travier travier commented Jul 19, 2022

This PR only adds the manifests and prepare the repo layout to match the upcoming COSA changes. This should be completely transparent for now but should make manual testing of RHCOS 9.0 & SCOS 9 easier.


manifests: Prepare for variant support in COSA


manifests: Add RHEL 9.0 variant

Only add the manifests and do not enable CI yet.


manifests: Add SCOS variant

Only add the manifests and do not enable CI yet.

@travier travier changed the title manifests: Prepare for variant support in COSA manifests: Prepare for variant support in COSA and add RHEL 9.0 & SCOS variants Jul 19, 2022
@openshift-ci openshift-ci Bot requested review from ashcrow and gursewak1997 July 19, 2022 17:38
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 19, 2022
@travier
Copy link
Copy Markdown
Member Author

travier commented Jul 19, 2022

Replaces #854, #856 and #855.

The CI changes will be added later.

@cgwalters
Copy link
Copy Markdown
Member

/retest

@cgwalters
Copy link
Copy Markdown
Member

I verified (after rebasing this on current master) that switching to this branch is a no-op for an existing cosa build. That helps gain confidence that we can't break rhel8.

@cgwalters
Copy link
Copy Markdown
Member

OK I got a local c9s build with two changes; first, we can use the distribution-gpg-keys we already have:

--- a/repos/c9s.repo
+++ b/repos/c9s.repo
@@ -4,7 +4,7 @@ baseurl=http://mirror.stream.centos.org/9-stream/BaseOS/$basearch/os
 gpgcheck=1
 repo_gpgcheck=0
 enabled=1
-gpgkey=file:///tmp/RPM-GPG-KEY-centosofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
 [appstream]
 name=CentOS Stream 9 - AppStream
@@ -12,7 +12,7 @@ baseurl=http://mirror.stream.centos.org/9-stream/AppStream/$basearch/os
 gpgcheck=1
 repo_gpgcheck=0
 enabled=1
-gpgkey=file:///tmp/RPM-GPG-KEY-centosofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
 [nfv]
 name=CentOS Stream 9 - NFV
@@ -20,7 +20,7 @@ baseurl=http://mirror.stream.centos.org/9-stream/NFV/$basearch/os
 gpgcheck=1
 repo_gpgcheck=0
 enabled=1
-gpgkey=file:///tmp/RPM-GPG-KEY-centosofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
 [rt]
 name=CentOS Stream 9 - RT
@@ -28,7 +28,7 @@ baseurl=http://mirror.stream.centos.org/9-stream/RT/$basearch/os
 gpgcheck=1
 repo_gpgcheck=0
 enabled=1
-gpgkey=file:///tmp/RPM-GPG-KEY-centosofficial
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
 [openvswitch]
 name=CentOS Stream 9 OpenvSwitch

@cgwalters
Copy link
Copy Markdown
Member

Second, I know there's debate about "where to build ocp packages" but we already do ship https://mirror.openshift.com/pub/openshift-v4/amd64/dependencies/rpms/4.11-el8-beta/

So via e.g.

cat > src/config/ocp.repo << EOF
[rhel-8-server-ose]
name=OCP rpms
baseurl=https://mirror.openshift.com/pub/openshift-v4/amd64/dependencies/rpms/4.11-el8-beta/
gpgcheck=0
enabled=1
EOF
$

We get that stuff; that one isn't gated on subscriptions so we can just include it by default.

@travier travier force-pushed the scos4 branch 3 times, most recently from 10f3c69 to 20ab24a Compare July 20, 2022 07:55
@cgwalters
Copy link
Copy Markdown
Member

/override ci/prow/periodic-images

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 20, 2022

@cgwalters: Overrode contexts on behalf of cgwalters: ci/prow/periodic-images

Details

In response to this:

/override ci/prow/periodic-images

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.

@cgwalters
Copy link
Copy Markdown
Member

/lgtm

@cgwalters
Copy link
Copy Markdown
Member

/retest

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 20, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 20, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, 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:

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

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 20, 2022

@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.

@travier travier deleted the scos4 branch July 22, 2022 09:34
travier added a commit to travier/coreos-assembler that referenced this pull request Jul 29, 2022
Several variants may be provided from a single Git config repo:
- If no variant is explicitly selected then the default `manifest.yaml`
  will be used.
- If there is no `manifest.yaml` file provided by default in the repo,
  then COSA will read the `variant_default` file to figure out which
  variant to use by default.
- If you explicitly specify a variant as parameter then COSA will read
  the corresponding `variant_$VARIANT` file and use that as default
  instead, overriding any default set in the repo.

See:
- openshift/os#852
- openshift/os#901

Reworks: 480c239 init: Require specifying a config repository
travier added a commit to travier/coreos-assembler that referenced this pull request Jul 29, 2022
Several variants may be provided from a single Git config repo:
- If no variant is explicitly selected then the default `manifest.yaml`
  will be used.
- If there is no `manifest.yaml` file provided by default in the repo,
  then COSA will read the `variant_default` file to figure out which
  variant to use by default.
- If you explicitly specify a variant as parameter then COSA will read
  the corresponding `variant_$VARIANT` file and use that as default
  instead, overriding any default set in the repo.

See:
- openshift/os#852
- openshift/os#901

Reworks: 480c239 init: Require specifying a config repository
travier added a commit to travier/coreos-assembler that referenced this pull request Jul 29, 2022
Several variants may be provided from a single Git config repo:
- If no variant is explicitly selected then the default `manifest.yaml`
  will be used.
- If there is no `manifest.yaml` file provided by default in the repo,
  then COSA will read the `variant_default` file to figure out which
  variant to use by default.
- If you explicitly specify a variant as parameter then COSA will read
  the corresponding `variant_$VARIANT` file and use that as default
  instead, overriding any default set in the repo.

See:
- openshift/os#852
- openshift/os#901

Reworks: 480c239 init: Require specifying a config repository
travier added a commit to travier/coreos-assembler that referenced this pull request Aug 2, 2022
Several variants may be provided from a single Git config repo:
- If no variant is explicitly selected then the default `manifest.yaml`
  will be used.
- If there is no `manifest.yaml` file provided by default in the repo,
  then COSA will read the `variant_default` file to figure out which
  variant to use by default.
- If you explicitly specify a variant as parameter then COSA will read
  the corresponding `variant_$VARIANT` file and use that as default
  instead, overriding any default set in the repo.

See:
- openshift/os#852
- openshift/os#901

Reworks: 480c239 init: Require specifying a config repository
travier added a commit to travier/coreos-assembler that referenced this pull request Aug 4, 2022
Several variants may be provided from a single Git config repo:
- If no variant is explicitly selected then the default `manifest.yaml`
  will be used.
- If there is no `manifest.yaml` file provided by default in the repo,
  then COSA will read the `variant_default` file to figure out which
  variant to use by default.
- If you explicitly specify a variant as parameter then COSA will read
  the corresponding `variant_$VARIANT` file and use that as default
  instead, overriding any default set in the repo.

See:
- openshift/os#852
- openshift/os#901

Reworks: 480c239 init: Require specifying a config repository
travier added a commit to travier/coreos-assembler that referenced this pull request Aug 22, 2022
Several variants may be provided from a single Git config repo:
- If no variant is explicitly selected then the default `manifest.yaml`
  will be used.
- If there is no `manifest.yaml` file provided by default in the repo,
  then COSA will read the `variant_default` file to figure out which
  variant to use by default.
- If you explicitly specify a variant as parameter then COSA will read
  the corresponding `variant_$VARIANT` file and use that as default
  instead, overriding any default set in the repo.

See:
- openshift/os#852
- openshift/os#901

Reworks: 480c239 init: Require specifying a config repository
travier added a commit to travier/coreos-assembler that referenced this pull request Aug 23, 2022
Several variants may be provided from a single Git config repo:
- If no variant is explicitly selected then the default `manifest.yaml`
  will be used.
- If there is no `manifest.yaml` file provided by default in the repo,
  then COSA will read the `variant_default` file to figure out which
  variant to use by default.
- If you explicitly specify a variant as parameter then COSA will read
  the corresponding `variant_$VARIANT` file and use that as default
  instead, overriding any default set in the repo.

See:
- openshift/os#852
- openshift/os#901

Reworks: 480c239 init: Require specifying a config repository
travier added a commit to travier/coreos-assembler that referenced this pull request Aug 23, 2022
Several variants may be provided from a single Git config repo:
- If no variant is explicitly selected then the default `manifest.yaml`
  will be used.
- If there is no `manifest.yaml` file provided by default in the repo,
  then COSA will read the `variant_default` file to figure out which
  variant to use by default.
- If you explicitly specify a variant as parameter then COSA will read
  the corresponding `variant_$VARIANT` file and use that as default
  instead, overriding any default set in the repo.

See:
- openshift/os#852
- openshift/os#901

Reworks: 480c239 init: Require specifying a config repository
travier added a commit to travier/coreos-assembler that referenced this pull request Aug 25, 2022
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
- https://github.com/openshift/os/pull/XYZ # TODO

Reworks: 480c239 init: Require specifying a config repository
travier added a commit to travier/coreos-assembler that referenced this pull request Aug 25, 2022
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 added a commit to travier/coreos-assembler that referenced this pull request Aug 26, 2022
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 added a commit to travier/coreos-assembler that referenced this pull request Aug 26, 2022
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 added a commit to travier/coreos-assembler that referenced this pull request Aug 26, 2022
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 added a commit to coreos/coreos-assembler that referenced this pull request Aug 29, 2022
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
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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants