Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-7582, OCPBUGS-13754: overlay.d: move 30gcp-udev-rules overlay to RHCOS #1310

Merged

Conversation

dustymabe
Copy link
Member

These files were dropped from the FCOS overlay in [1] because
they are now being delivered via the google-compute-engine-guest-configs-udev
subpackage. Until this package exists in RHEL we'll add an overlay
to RHCOS with the rules (they have now been updated to match latest
upstream).

[1] coreos/fedora-coreos-config#2450

coreosbot and others added 2 commits June 8, 2023 00:02
Dusty Mabe (1):
      manifests/fedora-coreos-base: re-organize arch includes package list comments

Renata Ravanelli (1):
      Add google-compute-engine-guest-configs-udev package; drop 30gcp-udev-rules overlay
These files were dropped from the FCOS overlay in [1] because
they are now being delivered via the google-compute-engine-guest-configs-udev
subpackage. Until this package exists in RHEL we'll add an overlay
to RHCOS with the rules (they have now been updated to match latest
upstream).

[1] coreos/fedora-coreos-config#2450
@openshift-ci openshift-ci bot requested review from aaradhak and bgilbert June 8, 2023 19:28
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 8, 2023
@dustymabe
Copy link
Member Author

dustymabe commented Jun 8, 2023

This is a fix for https://issues.redhat.com/browse/OCPBUGS-13754, which we'll then backport to 4.13.

@dustymabe
Copy link
Member Author

Note this should also be a fix for https://issues.redhat.com/browse/OCPBUGS-7582

Copy link
Member

@mike-nguyen mike-nguyen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 8, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 8, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dustymabe, mike-nguyen

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

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [dustymabe,mike-nguyen]

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

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 1550016 and 2 for PR HEAD 2513047 in total

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 9, 2023

@dustymabe: all tests passed!

Full PR test history. Your PR dashboard.

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 4874462 into openshift:master Jun 9, 2023
7 checks passed
@travier
Copy link
Member

travier commented Jun 9, 2023

/cherrypick release-4.13

@openshift-cherrypick-robot

@travier: #1310 failed to apply on top of branch "release-4.13":

Applying: Bump fedora-coreos-config
Using index info to reconstruct a base tree...
M	fedora-coreos-config
Falling back to patching base and 3-way merge...
Failed to merge submodule fedora-coreos-config (not checked out)
Auto-merging fedora-coreos-config
CONFLICT (submodule): Merge conflict in fedora-coreos-config
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump fedora-coreos-config
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-4.13

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.

@dustymabe
Copy link
Member Author

4.13 backport: #1312

@travier
Copy link
Member

travier commented Jun 12, 2023

/retitle OCPBUGS-7582, OCPBUGS-13754: overlay.d: move 30gcp-udev-rules overlay to RHCOS

@openshift-ci openshift-ci bot changed the title overlay.d: move 30gcp-udev-rules overlay to RHCOS OCPBUGS-7582, OCPBUGS-13754: overlay.d: move 30gcp-udev-rules overlay to RHCOS Jun 12, 2023
@openshift-ci-robot
Copy link

@dustymabe: Jira Issue OCPBUGS-13754: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-13754 has been moved to the MODIFIED state.

In response to this:

These files were dropped from the FCOS overlay in [1] because
they are now being delivered via the google-compute-engine-guest-configs-udev
subpackage. Until this package exists in RHEL we'll add an overlay
to RHCOS with the rules (they have now been updated to match latest
upstream).

[1] coreos/fedora-coreos-config#2450

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
Copy link
Member

travier commented Jun 12, 2023

The bot only picks one Jira card apparently. This is for:

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.

None yet

7 participants