manifests/9.2: Use RHEL 9.2 repos & cleanups by travier · Pull Request #1204 · openshift/os

travier · 2023-03-16T11:55:12Z

Revert "manifest/9.2: Ensure package come from RHEL by default"

We already have to use coreos-installer from the RHAOS repo and it's
likely that we will have to do it again in the future for 4.14.

Remove this to avoid having to make a PR for each package.

This reverts commit 49f9824.

manifest/9.2: Keep legacy coreos/toolbox

Unfortuantely, we're not yet ready to move to the new containers/toolbox
workflow. We'll attempt that for a future release.

See: https://issues.redhat.com/browse/OCPBUGS-8009
Partially reverts: 65776fa

manifests: Merge common-el9.yaml into common.yaml

manifests/9.2: Use RHEL 9.2 repos

manifest/c9s: Update for 4.14

manifest/c9s: Disable all repos by default

manifests: Remove RHEL 8 manifests

manifests: Remove RHEL 9.0 manifests

manifest: Back to rhel toolbox

Since we don't have a legacy toolbox build in OCP channels yet.

rhel-9.2: Fix two more references to 9.0

With this things build for me.

We already have to use coreos-installer from the RHAOS repo and it's likely that we will have to do it again in the future for 4.14. Remove this to avoid having to make a PR for each package. This reverts commit 49f9824.

Unfortuantely, we're not yet ready to move to the new containers/toolbox workflow. We'll attempt that for a future release. See: https://issues.redhat.com/browse/OCPBUGS-8009 Partially reverts: openshift@65776fa

travier · 2023-03-16T11:55:36Z

/skip

Since we don't have a legacy toolbox build in OCP channels yet.

With this things build for me.

cgwalters · 2023-03-17T19:35:20Z

OK I pushed two additional commits here.

HuijingHei · 2023-03-20T02:31:18Z

+    s=/usr/lib/dracut/modules.d/95nvmf/nvmf-autoconnect.sh
+    if test -f "$s"; then
+      chmod a+x "$s"
+    fi


We can remove workaround for nvmf-autoconnect.sh, as the issue does not exist on 9.2

[cloud-user@citest-1 ~]$ rpm -q dracut dracut-057-21.git20230214.el9.x86_64 [cloud-user@citest-1 ~]$ ll /usr/lib/dracut/modules.d/95nvmf/nvmf-autoconnect.sh -rwxr-xr-x. 1 root root 140 Jun 19 2022 /usr/lib/dracut/modules.d/95nvmf/nvmf-autoconnect.sh [cloud-user@citest-1 ~]$ cat /etc/os-release ... REDHAT_SUPPORT_PRODUCT_VERSION="9.2 Beta"

Hmm yes...though this is in the FCOS config, so fixing that would require a cycle there...let's just keep this on our list of things to clean up later.

We should be using 4.14 in a few more places here.

jlebon

Overall LGTM. A lot of the commits should probably be squashed to make a cleaner history, but fine as is too.

/approve
/lgtm

jlebon · 2023-03-20T19:37:52Z

  - rhel-9.2-appstream
  - rhel-9.2-fast-datapath
-  - rhel-9.2-server-ose-4.13
+  - rhel-9.2-server-ose-4.13  # FIXME a few things are built only in 4.13 right now, like podman


Do we have a tracker for this we could paste here?

openshift-ci-robot · 2023-03-20T19:48:26Z

/retest-required

Remaining retests: 0 against base HEAD 12d5806 and 2 for PR HEAD ee85017 in total

cgwalters · 2023-03-21T00:03:48Z

/override ci/prow/rhcos-92-build-test-metal
/override ci/prow/rhcos-92-build-test-qemu
beta content isn't available yet

openshift-ci · 2023-03-21T00:04:05Z

@cgwalters: Overrode contexts on behalf of cgwalters: ci/prow/rhcos-92-build-test-metal, ci/prow/rhcos-92-build-test-qemu

Details

In response to this:

/override ci/prow/rhcos-92-build-test-metal
/override ci/prow/rhcos-92-build-test-qemu
beta content isn't available yet

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.

openshift-ci · 2023-03-21T01:12:50Z

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

c4rt0 · 2023-03-21T12:17:29Z

/lgtm

openshift-ci · 2023-03-21T12:18:19Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: c4rt0, 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~~ [c4rt0,jlebon,travier]

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

mike-nguyen · 2023-03-21T12:21:13Z

    repos:
-      # - rhel-9.0-appstream
-      - sig-virtualization
+      - rhel-9.2-appstream


I couldn't find kata-containers in the rhel-9.2-appstream repo

Yeah, no kata-containers in rhel, only c9s.

C9S is RHEL (9). Having a SIG doesn't mean it's "in C9S", only associated with it.

Sorry, I meant C9S SIG, you are right.

https://mirror.stream.centos.org/SIGs/9-stream/virt/x86_64/kata-containers

cgwalters · 2023-03-21T17:29:16Z

Argh. FTR I accidentally force-pushed over the original PR branch here. I don't think this matters now that it's merged, but just for historical reference.

travier added 8 commits March 16, 2023 11:32

Revert "manifest/9.2: Ensure package come from RHEL by default"

e346f8a

We already have to use coreos-installer from the RHAOS repo and it's likely that we will have to do it again in the future for 4.14. Remove this to avoid having to make a PR for each package. This reverts commit 49f9824.

manifest/9.2: Keep legacy coreos/toolbox

3eb4abb

Unfortuantely, we're not yet ready to move to the new containers/toolbox workflow. We'll attempt that for a future release. See: https://issues.redhat.com/browse/OCPBUGS-8009 Partially reverts: openshift@65776fa

manifests: Merge common-el9.yaml into common.yaml

aa7f640

manifests/9.2: Use RHEL 9.2 repos

54daebb

manifest/c9s: Update for 4.14

73a8eb2

manifest/c9s: Disable all repos by default

ab22dee

manifests: Remove RHEL 8 manifests

be10693

manifests: Remove RHEL 9.0 manifests

27cd97c

travier marked this pull request as draft March 16, 2023 11:55

openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 16, 2023

openshift-ci Bot requested review from HuijingHei and sohankunkerkar March 16, 2023 11:55

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 16, 2023

travier changed the title ~~Revert "manifest/9.2: Ensure package come from RHEL by default"~~ manifests/9.2: Use RHEL 9.2 repos & cleanups Mar 16, 2023

travier mentioned this pull request Mar 16, 2023

bump versions for 4.14 #1201

Closed

cgwalters added 2 commits March 17, 2023 15:33

manifest: Back to rhel toolbox

cdeb252

Since we don't have a legacy toolbox build in OCP channels yet.

rhel-9.2: Fix two more references to 9.0

fa8eef4

With this things build for me.

HuijingHei reviewed Mar 20, 2023

View reviewed changes

More use of 4.14

2715f8e

We should be using 4.14 in a few more places here.

cgwalters marked this pull request as ready for review March 20, 2023 17:50

openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 20, 2023

openshift-ci Bot requested review from jlebon and ravanelli March 20, 2023 17:52

More 90 -> 92 adjustments

ee85017

jlebon approved these changes Mar 20, 2023

View reviewed changes

openshift-ci Bot assigned jlebon Mar 20, 2023

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 20, 2023

openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 20, 2023

cgwalters force-pushed the 9.2-beta branch 2 times, most recently from 5e590b7 to 4a1799e Compare March 20, 2023 21:16

prow: Also pull in 4.13 temporarily

c0ca55d

cgwalters force-pushed the 9.2-beta branch from 4a1799e to c0ca55d Compare March 20, 2023 21:42

Fix 9- to 9.2- for 4.14

630c049

openshift-ci Bot assigned c4rt0 Mar 21, 2023

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 21, 2023

mike-nguyen reviewed Mar 21, 2023

View reviewed changes

openshift-merge-robot merged commit f4a1076 into openshift:master Mar 21, 2023

cgwalters mentioned this pull request Mar 21, 2023

4.13 9.2 #1210

Merged

Conversation

travier commented Mar 16, 2023 • edited by cgwalters Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

travier commented Mar 16, 2023

Uh oh!

cgwalters commented Mar 17, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jlebon left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

openshift-ci-robot commented Mar 20, 2023

Uh oh!

cgwalters commented Mar 21, 2023

Uh oh!

openshift-ci Bot commented Mar 21, 2023

Uh oh!

openshift-ci Bot commented Mar 21, 2023

Uh oh!

c4rt0 commented Mar 21, 2023

Uh oh!

openshift-ci Bot commented Mar 21, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cgwalters commented Mar 21, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

travier commented Mar 16, 2023 •

edited by cgwalters

Loading