Skip to content

[release-4.11] Rebase to RHEL 8.6#817

Merged
cgwalters merged 6 commits intoopenshift:release-4.11from
openshift-cherrypick-robot:cherry-pick-815-to-release-4.11
Jun 6, 2022
Merged

[release-4.11] Rebase to RHEL 8.6#817
cgwalters merged 6 commits intoopenshift:release-4.11from
openshift-cherrypick-robot:cherry-pick-815-to-release-4.11

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown

@openshift-cherrypick-robot openshift-cherrypick-robot commented Jun 6, 2022

This is an automated cherry-pick of #815

/assign cgwalters

travier and others added 6 commits June 6, 2022 15:10
@travier
Rebase to RHEL 8.6
fea6458 
Manual revert of the last revert to RHEL 8.5 to keep other changes in
place.
@dustymabe
Revert "overlay.d: add 25rhcos-azure-udev-rules"
c110e61 
The WALinuxAgent-udev package exists now.

This reverts commit 5cd6441.
@dustymabe
Remove statoverride file from 25rhcos-azure-udev-rules dir
2f03cd8 
The directory is no longer needed because the 25rhcos-azure-udev-rules
overlay got removed in the previous commit.
@dustymabe
add +25rhcos-azure-udev overlay
d22b20f 
This migrates the glue code that installs the udev rules into the
initramfs to an overlay module in the RHCOS repo. It was no longer
needed in FCOS and removed from the overlay there in [1].

[1] coreos/fedora-coreos-config#1686
@miabbott
manifest: pull container-tools content from RHAOS repo
299ac58 
We've worked with the Containers team to enable builds of certain
container-tools RPMs from the RHAOS repo. This allows us to land OCP
specific changes to these packages and potentially ship newer versions
of these packages than what would available in the module.
@travier
manifest: Properly write os-release related content in /usr
434f514 
Fixes: 31f295e Use the generic redhat-release package
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2068148
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jun 6, 2022
Merged
@openshift-ci openshift-ci Bot requested review from aaradhak and dustymabe June 6, 2022 15:13
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 6, 2022

@openshift-cherrypick-robot: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/validate 434f514 link true /test validate
ci/prow/build-test-qemu 434f514 link true /test build-test-qemu

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.

@cgwalters
Copy link
Copy Markdown
Member

cgwalters commented Jun 6, 2022 

 INFO[2022-06-06T15:13:47Z] Logs for container test in pod validate:     
INFO[2022-06-06T15:13:47Z] + git submodule update --init --recursive
fatal: unsafe repository ('/go/src/github.com/openshift/os' is owned by someone else)
To add an exception for this directory, call:
	git config --global --add safe.directory /go/src/github.com/openshift/os

Hmm, but we have #814 here...ooh, I see the CI configuration in openshift/release has also drifted between master and 4.11

@cgwalters
Copy link
Copy Markdown
Member

cgwalters commented Jun 6, 2022

openshift/release#29178

@cgwalters
Copy link
Copy Markdown
Member

cgwalters commented Jun 6, 2022

Given there isn't a big delta between master and 4.11 right now, I'd lean towards force merging instead of doing another CI fixes cycle, and powering through any further downstream pipeline issues.

Thoughts/objections?

@miabbott
Copy link
Copy Markdown
Member

miabbott commented Jun 6, 2022

Given there isn't a big delta between master and 4.11 right now, I'd lean towards force merging instead of doing another CI fixes cycle, and powering through any further downstream pipeline issues.

Thoughts/objections?

I'm risk averse, so I'm a bit concerned about breaking things when we have a lot of other things going on. I'd feel a bit better if we had more folks able to focus on any possible problems that are introduced by this.

But I'll go with the majority opinion.

@miabbott
Copy link
Copy Markdown
Member

miabbott commented Jun 6, 2022

Given there isn't a big delta between master and 4.11 right now, I'd lean towards force merging instead of doing another CI fixes cycle, and powering through any further downstream pipeline issues.
Thoughts/objections?

I'm risk averse, so I'm a bit concerned about breaking things when we have a lot of other things going on. I'd feel a bit better if we had more folks able to focus on any possible problems that are introduced by this.

But I'll go with the majority opinion.

Though since the downstream pipelines are already using release-4.11 and the 8.6 repos, this probably should land now than later.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 6, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: miabbott, openshift-cherrypick-robot

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 openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 6, 2022
@cgwalters cgwalters merged commit a67d058 into openshift:release-4.11 Jun 6, 2022
@miabbott miabbott mentioned this pull request Jun 7, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@aaradhak aaradhak Awaiting requested review from aaradhak

@dustymabe dustymabe Awaiting requested review from dustymabe

1 more reviewer

@miabbott miabbott miabbott approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@cgwalters cgwalters

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@openshift-cherrypick-robot @cgwalters @miabbott @travier @dustymabe