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

COS-2692: Prep patches for base c9s rework #1446

Merged
merged 7 commits into from
Mar 11, 2024

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Feb 21, 2024

This is split out of #1445. See individual commits for details.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 21, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 21, 2024
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 21, 2024
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 29, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 29, 2024
@jlebon jlebon changed the title Prep patches for base c9s rework NO-JIRA: Prep patches for base c9s rework Feb 29, 2024
@jlebon
Copy link
Member Author

jlebon commented Feb 29, 2024

Rebased! This one isn't blocked on anything.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 29, 2024
@openshift-ci-robot
Copy link

@jlebon: This pull request explicitly references no jira issue.

In response to this:

This is split out of #1445. See individual commits for 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 openshift-eng/jira-lifecycle-plugin repository.

I think it's confusing when a single postprocessing item actually
does multiple disparate things. Let's try to split them up to make it
clearer.

While we're here, make the indentation consistent.

This patch should have no functional effect. Best viewed with whitespace
changes ignored.
@jlebon jlebon changed the title NO-JIRA: Prep patches for base c9s rework COS-2692: Prep patches for base c9s rework Mar 5, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 5, 2024

@jlebon: This pull request references COS-2692 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to this:

This is split out of #1445. See individual commits for 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 openshift-eng/jira-lifecycle-plugin repository.

@jlebon
Copy link
Member Author

jlebon commented Mar 5, 2024

/jira refresh

@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 5, 2024

@jlebon: This pull request references COS-2692 which is a valid jira issue.

In response to this:

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

packages-openshift.yaml Outdated Show resolved Hide resolved
@travier
Copy link
Member

travier commented Mar 7, 2024

Mostly LGTM. Small nits. Maybe we could use another Jira card than https://issues.redhat.com//browse/COS-2692 or update the scope to clarify things? Thanks!

@travier
Copy link
Member

travier commented Mar 7, 2024

Overall, I don't see a reason to block this from being merged as the nits are minor and can be addressed in a follow-up PR.

/lgtm
/hold

Feel free un unhold as needed.

@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 Mar 7, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 7, 2024
As prep for openshift#799, let's better split the postprocessing steps that are
related to OCP from those that have tighter binding to RHEL proper.

This should have no visible effect.
We were pulling this in transitively, but we do depend on it in
postprocessing steps (for semanage). Let's make it explicit.
Just get at the initramfs using a glob instead of trying to parse the
BLS. This will work regardless of how the BLS entry is named but assumes
that there is only one BLS entry (which should always be the case for
these tests).
This is part of openshift#1445.

Those tests are all actually testing OCP components. In the new model,
they should be run against an OCP layered image instead. Add a tag on
them so that we'll be able to run them separately.
It's in all the development streams we care about now so just simplify
the manifests.

No functional change.
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 7, 2024
@jlebon
Copy link
Member Author

jlebon commented Mar 7, 2024

Mostly LGTM. Small nits. Maybe we could use another Jira card than issues.redhat.com//browse/COS-2692 or update the scope to clarify things? Thanks!

Do you mean having a separate JIRA card for just these prep patches?

Copy link
Contributor

openshift-ci bot commented Mar 7, 2024

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

@travier
Copy link
Member

travier commented Mar 11, 2024

Do you mean having a separate JIRA card for just these prep patches?

Yes, but we can also rewind the card back to in progress if needed so not a big deal.

@travier
Copy link
Member

travier commented Mar 11, 2024

/lgtm
Feel free to unhold when good to go

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

openshift-ci bot commented Mar 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jlebon, travier

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:

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

@jlebon
Copy link
Member Author

jlebon commented Mar 11, 2024

/hold cancel

@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 Mar 11, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 86d679a into openshift:master Mar 11, 2024
7 checks passed
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. 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
Development

Successfully merging this pull request may close these issues.

4 participants