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.

Sign up for GitHub

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

Jump to bottom

[release-4.17] OCPBUGS-41376: common.yaml: add subscription-manager #1612

Merged
merged 2 commits into from
Oct 3, 2024
Merged

[release-4.17] OCPBUGS-41376: common.yaml: add subscription-manager #1612

merged 2 commits into from
Oct 3, 2024

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #1563

/assign jlebon

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 6, 2024
Merged
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-35247 has been cloned as Jira Issue OCPBUGS-41376. Will retitle bug to link to clone.
/retitle [release-4.17] OCPBUGS-41376: common.yaml: add subscription-manager

In response to this:

This is an automated cherry-pick of #1563

/assign jlebon

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested review from c4rt0 and marmijo September 6, 2024 19:48
@openshift-ci openshift-ci bot changed the title [release-4.17] OCPBUGS-35247: common.yaml: add subscription-manager [release-4.17] OCPBUGS-41376: common.yaml: add subscription-manager Sep 6, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 6, 2024
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-41376, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is an automated cherry-pick of #1563

/assign jlebon

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Sep 6, 2024
marmijo
marmijo approved these changes Sep 6, 2024
View reviewed changes
Copy link
Contributor

@marmijo marmijo 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 lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 6, 2024
@jlebon
Copy link
Member

jlebon commented Sep 6, 2024

Let's hold this until after GA. It'll be a z-stream update.
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 6, 2024
@dustymabe
Copy link
Member

Let's hold this until after GA. It'll be a z-stream update. /hold

4.17 is now GA

/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 Oct 2, 2024
@jlebon
Copy link
Member

jlebon commented Oct 2, 2024

/retest
/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Oct 2, 2024
@openshift-ci-robot
Copy link

@jlebon: This pull request references Jira Issue OCPBUGS-41376, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.0) matches configured target version for branch (4.17.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-35247 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-35247 targets the "4.18.0" version, which is one of the valid target versions: 4.18.0
  • bug has dependents

Requesting review from QA contact:
/cc @mike-nguyen

In response to this:

/retest
/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Oct 2, 2024
@dustymabe
Copy link
Member

/lgtm

@jlebon
Copy link
Member

jlebon commented Oct 2, 2024

Ahhh need to also backport coreos/fedora-coreos-config#3147.
Done in: coreos/fedora-coreos-config#3189

@jlebon jlebon mentioned this pull request Oct 2, 2024
Merged
@jlebon
common.yaml: add subscription-manager
dce790c 
We currently ship dnf in RHCOS but it's cumbersome to use because the
librhsm magic we had for rpm-ostree to make content available during
builds on a subscribed node doesn't work with dnf. For that, it seems
like we need full-blown subscription-manager in the container image.

Add it.

This matches centos-bootc/rhel-bootc shipping subman as well, though I'd
like in the future to investigate lowering the dependency requirements
to just a dnf plugin + librhsm.

Fixes: https://issues.redhat.com/browse/OCPBUGS-35247
@jlebon jlebon force-pushed the cherry-pick-1563-to-release-4.17 branch from 70a2550 to fc8cd12 Compare October 2, 2024 19:30
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 2, 2024
@jlebon
Copy link
Member

jlebon commented Oct 2, 2024

Updated this now with a submodule bump for coreos/fedora-coreos-config#3189!

@dustymabe
Copy link
Member

I think you botched the git log message in the fcos submodule bump. If this isn't time sensitive might be worth fixing that. If it is then meh..

@jlebon
Bump fedora-coreos-config
139c7fb 
Jonathan Lebon (1):
      common.yaml: add subscription-manager
@jlebon jlebon force-pushed the cherry-pick-1563-to-release-4.17 branch from fc8cd12 to 139c7fb Compare October 3, 2024 13:42
@jlebon
Copy link
Member

jlebon commented Oct 3, 2024

Updated!

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Oct 3, 2024

@openshift-cherrypick-robot: 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-sigs/prow repository. I understand the commands that are listed here.

@mike-nguyen
Copy link
Member

/label backport-risk-assessed
/label cherry-pick-approved

@openshift-ci openshift-ci bot added backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Oct 3, 2024
@mike-nguyen
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 3, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Oct 3, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dustymabe, marmijo, mike-nguyen, openshift-cherrypick-robot

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,marmijo,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-merge-bot openshift-merge-bot bot merged commit e74ae56 into openshift:release-4.17 Oct 3, 2024
5 checks passed
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-41376: All pull requests linked via external trackers have merged:

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

In response to this:

This is an automated cherry-pick of #1563

/assign jlebon

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 openshift-eng/jira-lifecycle-plugin repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marmijo marmijo marmijo approved these changes

@c4rt0 c4rt0 Awaiting requested review from c4rt0

@mike-nguyen mike-nguyen Awaiting requested review from mike-nguyen

Assignees

@dustymabe dustymabe

@jlebon jlebon

@mike-nguyen mike-nguyen

@marmijo marmijo

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@openshift-cherrypick-robot @openshift-ci-robot @jlebon @dustymabe @mike-nguyen @marmijo