Skip to content

repos: Clarify usage and which RHEL versions are available in repos#28521

Merged
openshift-merge-robot merged 5 commits intoopenshift:masterfrom
travier:repos
Jun 3, 2022
Merged

repos: Clarify usage and which RHEL versions are available in repos#28521
openshift-merge-robot merged 5 commits intoopenshift:masterfrom
travier:repos

Conversation

@travier
Copy link
Copy Markdown
Member

@travier travier commented May 12, 2022

For RHCOS, we want to be able to have a stable name for each RHEL versions available from a repo to help us during migrations from one RHEL minor to the next. Thus we will no longer used the un-versioned rhel8 repos and use minor versioned ones: rhel86, rhel90.

Whether or not the URLs used for the repos are minor versioned is a different issue that we are waiting for confirmation. See openshift-eng/ocp-build-data#1576 (comment) & #28503 (comment)

Keep the un-versioned one rhel8 for compatibility for other potential users and make it use the latest released RHEL.

@travier
Copy link
Copy Markdown
Member Author

travier commented May 12, 2022

CC @miabbott @cgwalters @yselkowitz

@miabbott
Copy link
Copy Markdown
Member

Looks great! Thanks for doing this.

/approve

@hongkailiu
Copy link
Copy Markdown
Member

/cc @jupierce

/approve

@openshift-ci openshift-ci Bot requested a review from jupierce May 13, 2022 14:06
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 13, 2022
Comment thread core-services/release-controller/_repos/ocp-4.11-rhel85.repo Outdated
@travier
Copy link
Copy Markdown
Member Author

travier commented May 13, 2022

/hold

@openshift-ci openshift-ci Bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 13, 2022
@smg247
Copy link
Copy Markdown
Member

smg247 commented May 17, 2022

/uncc

@openshift-ci openshift-ci Bot removed the request for review from smg247 May 17, 2022 15:11
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 17, 2022
@travier
Copy link
Copy Markdown
Member Author

travier commented May 17, 2022

/unhold

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 17, 2022
@travier
Copy link
Copy Markdown
Member Author

travier commented May 17, 2022

Updated to use RHEL 8.6 EUS everywhere and include #26811.

@miabbott
Copy link
Copy Markdown
Member

miabbott commented May 17, 2022

Since we are doing clean up in this PR, couple of questions:

  • do we still need an aarch64 version of the 4.11/4.12 repos: ocp-4.11-rhel8-aarch64.repo and ocp-4.12-rhel8-aarch64.repo
  • should the unversioned rhel8 repo (ocp-4.11-rhel8.repo) change the path in the baseurl to be content/dist/rhel8/8/x86_64/appstream/os/? Users that need specific versions of RHEL should be able to reference one of the explicitly versioned repos.

@yselkowitz
Copy link
Copy Markdown
Contributor

Yes we still need aarch64 repo files because the "main" ones hard-code x86_64.

@travier
Copy link
Copy Markdown
Member Author

travier commented May 18, 2022

  • should the unversioned rhel8 repo (ocp-4.11-rhel8.repo) change the path in the baseurl to be content/dist/rhel8/8/x86_64/appstream/os/? Users that need specific versions of RHEL should be able to reference one of the explicitly versioned repos.

I think we still want that repo to be on the "correct" RHEL version for a given OCP release. I kept it for consumers that want the latest valid RHEL for a given OCP release without caring about the version itself.

@travier
Copy link
Copy Markdown
Member Author

travier commented May 18, 2022

We might however want to remove some RHCOS specific repos from those files. I'll try that.

travier added 3 commits June 3, 2022 17:46
From RHEL 8.6 onwards there is no advanced virtualization repository
anymore.

Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
travier added 2 commits June 3, 2022 17:46
- Use RHEL 8.6 EUS repos
- Use RHEL 8.6 TUS for NFV repo
- Remove RHEL 8.5 repos
@travier travier force-pushed the repos branch 2 times, most recently from 88abf91 to 8e38d64 Compare June 3, 2022 15:49
@travier
Copy link
Copy Markdown
Member Author

travier commented Jun 3, 2022

Updated this PR to focus on cleanups and the switch to RHEL 8.6 in 4.11 and later

@miabbott
Copy link
Copy Markdown
Member

miabbott commented Jun 3, 2022

/lgtm

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

openshift-ci Bot commented Jun 3, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hongkailiu, miabbott, 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 Jun 3, 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.

@openshift-merge-robot openshift-merge-robot merged commit 3a7129d into openshift:master Jun 3, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 3, 2022

@travier: Updated the following 7 configmaps:

  • base-repos configmap in namespace ocp at cluster vsphere using the following files:
    • key ocp-4.11-rhel8-aarch64.repo using file core-services/release-controller/_repos/ocp-4.11-rhel8-aarch64.repo
    • key ocp-4.11-rhel8.repo using file core-services/release-controller/_repos/ocp-4.11-rhel8.repo
    • key ocp-4.11-rhel85.repo using file core-services/release-controller/_repos/ocp-4.11-rhel85.repo
    • key ocp-4.11-rhel86.repo using file core-services/release-controller/_repos/ocp-4.11-rhel86.repo
    • key ocp-4.12-rhel8-aarch64.repo using file core-services/release-controller/_repos/ocp-4.12-rhel8-aarch64.repo
    • key ocp-4.12-rhel8.repo using file core-services/release-controller/_repos/ocp-4.12-rhel8.repo
    • key ocp-4.12-rhel85.repo using file ``
    • key ocp-4.12-rhel86.repo using file core-services/release-controller/_repos/ocp-4.12-rhel86.repo
  • base-repos configmap in namespace ocp at cluster app.ci using the following files:
    • key ocp-4.11-rhel8-aarch64.repo using file core-services/release-controller/_repos/ocp-4.11-rhel8-aarch64.repo
    • key ocp-4.11-rhel8.repo using file core-services/release-controller/_repos/ocp-4.11-rhel8.repo
    • key ocp-4.11-rhel85.repo using file core-services/release-controller/_repos/ocp-4.11-rhel85.repo
    • key ocp-4.11-rhel86.repo using file core-services/release-controller/_repos/ocp-4.11-rhel86.repo
    • key ocp-4.12-rhel8-aarch64.repo using file core-services/release-controller/_repos/ocp-4.12-rhel8-aarch64.repo
    • key ocp-4.12-rhel8.repo using file core-services/release-controller/_repos/ocp-4.12-rhel8.repo
    • key ocp-4.12-rhel85.repo using file ``
    • key ocp-4.12-rhel86.repo using file core-services/release-controller/_repos/ocp-4.12-rhel86.repo
  • base-repos configmap in namespace ocp at cluster build01 using the following files:
    • key ocp-4.11-rhel8-aarch64.repo using file core-services/release-controller/_repos/ocp-4.11-rhel8-aarch64.repo
    • key ocp-4.11-rhel8.repo using file core-services/release-controller/_repos/ocp-4.11-rhel8.repo
    • key ocp-4.11-rhel85.repo using file core-services/release-controller/_repos/ocp-4.11-rhel85.repo
    • key ocp-4.11-rhel86.repo using file core-services/release-controller/_repos/ocp-4.11-rhel86.repo
    • key ocp-4.12-rhel8-aarch64.repo using file core-services/release-controller/_repos/ocp-4.12-rhel8-aarch64.repo
    • key ocp-4.12-rhel8.repo using file core-services/release-controller/_repos/ocp-4.12-rhel8.repo
    • key ocp-4.12-rhel85.repo using file ``
    • key ocp-4.12-rhel86.repo using file core-services/release-controller/_repos/ocp-4.12-rhel86.repo
  • base-repos configmap in namespace ocp at cluster build02 using the following files:
    • key ocp-4.11-rhel8-aarch64.repo using file core-services/release-controller/_repos/ocp-4.11-rhel8-aarch64.repo
    • key ocp-4.11-rhel8.repo using file core-services/release-controller/_repos/ocp-4.11-rhel8.repo
    • key ocp-4.11-rhel85.repo using file core-services/release-controller/_repos/ocp-4.11-rhel85.repo
    • key ocp-4.11-rhel86.repo using file core-services/release-controller/_repos/ocp-4.11-rhel86.repo
    • key ocp-4.12-rhel8-aarch64.repo using file core-services/release-controller/_repos/ocp-4.12-rhel8-aarch64.repo
    • key ocp-4.12-rhel8.repo using file core-services/release-controller/_repos/ocp-4.12-rhel8.repo
    • key ocp-4.12-rhel85.repo using file ``
    • key ocp-4.12-rhel86.repo using file core-services/release-controller/_repos/ocp-4.12-rhel86.repo
  • base-repos configmap in namespace ocp at cluster build03 using the following files:
    • key ocp-4.11-rhel8-aarch64.repo using file core-services/release-controller/_repos/ocp-4.11-rhel8-aarch64.repo
    • key ocp-4.11-rhel8.repo using file core-services/release-controller/_repos/ocp-4.11-rhel8.repo
    • key ocp-4.11-rhel85.repo using file core-services/release-controller/_repos/ocp-4.11-rhel85.repo
    • key ocp-4.11-rhel86.repo using file core-services/release-controller/_repos/ocp-4.11-rhel86.repo
    • key ocp-4.12-rhel8-aarch64.repo using file core-services/release-controller/_repos/ocp-4.12-rhel8-aarch64.repo
    • key ocp-4.12-rhel8.repo using file core-services/release-controller/_repos/ocp-4.12-rhel8.repo
    • key ocp-4.12-rhel85.repo using file ``
    • key ocp-4.12-rhel86.repo using file core-services/release-controller/_repos/ocp-4.12-rhel86.repo
  • base-repos configmap in namespace ocp at cluster build04 using the following files:
    • key ocp-4.11-rhel8-aarch64.repo using file core-services/release-controller/_repos/ocp-4.11-rhel8-aarch64.repo
    • key ocp-4.11-rhel8.repo using file core-services/release-controller/_repos/ocp-4.11-rhel8.repo
    • key ocp-4.11-rhel85.repo using file core-services/release-controller/_repos/ocp-4.11-rhel85.repo
    • key ocp-4.11-rhel86.repo using file core-services/release-controller/_repos/ocp-4.11-rhel86.repo
    • key ocp-4.12-rhel8-aarch64.repo using file core-services/release-controller/_repos/ocp-4.12-rhel8-aarch64.repo
    • key ocp-4.12-rhel8.repo using file core-services/release-controller/_repos/ocp-4.12-rhel8.repo
    • key ocp-4.12-rhel85.repo using file ``
    • key ocp-4.12-rhel86.repo using file core-services/release-controller/_repos/ocp-4.12-rhel86.repo
  • base-repos configmap in namespace ocp at cluster build05 using the following files:
    • key ocp-4.11-rhel8-aarch64.repo using file core-services/release-controller/_repos/ocp-4.11-rhel8-aarch64.repo
    • key ocp-4.11-rhel8.repo using file core-services/release-controller/_repos/ocp-4.11-rhel8.repo
    • key ocp-4.11-rhel85.repo using file core-services/release-controller/_repos/ocp-4.11-rhel85.repo
    • key ocp-4.11-rhel86.repo using file core-services/release-controller/_repos/ocp-4.11-rhel86.repo
    • key ocp-4.12-rhel8-aarch64.repo using file core-services/release-controller/_repos/ocp-4.12-rhel8-aarch64.repo
    • key ocp-4.12-rhel8.repo using file core-services/release-controller/_repos/ocp-4.12-rhel8.repo
    • key ocp-4.12-rhel85.repo using file ``
    • key ocp-4.12-rhel86.repo using file core-services/release-controller/_repos/ocp-4.12-rhel86.repo
Details

In response to this:

For RHCOS, we want to be able to have a stable name for each RHEL versions available from a repo to help us during migrations from one RHEL minor to the next. Thus we will no longer used the un-versioned rhel8 repos and use minor versioned ones: rhel86, rhel90.

Whether or not the URLs used for the repos are minor versioned is a different issue that we are waiting for confirmation. See openshift-eng/ocp-build-data#1576 (comment) & #28503 (comment)

Keep the un-versioned one rhel8 for compatibility for other potential users and make it use the latest released RHEL.

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.

@travier travier deleted the repos branch June 3, 2022 18:41
jupierce added a commit to jupierce/release that referenced this pull request Jun 6, 2022
These were removed in openshift#28521
but it prevents CI workloads from accessing packages built by
ART and tagged into ART's candidate tag.
Restoring until RHCOS can discuss  the reasoning with us.
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.

6 participants