Skip to content

OCPBUGS-52189, MCO-1626: [release-4.18] backport OCL to 4.18 #5025

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
Merged
merged 22 commits into from
May 27, 2025
Merged

OCPBUGS-52189, MCO-1626: [release-4.18] backport OCL to 4.18 #5025

merged 22 commits into from
May 27, 2025

Conversation

cheesesashimi
Copy link
Member

- What I did

- How to verify it

- Description for the changelog
Backports OCL to 4.18.z

@openshift-ci 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 May 1, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented May 1, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 1, 2025
@cheesesashimi cheesesashimi marked this pull request as ready for review May 1, 2025 21:50
@openshift-ci 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 May 1, 2025
@openshift-ci openshift-ci bot requested review from RishabhSaini and umohnani8 May 1, 2025 21:51
@cheesesashimi cheesesashimi force-pushed the zzlotnik/ocl-4.18-backport branch from be5acb5 to 54c4837 Compare May 2, 2025 15:03
@cheesesashimi
Copy link
Member Author

/test e2e-gcp-op-techpreview

1 similar comment
@cheesesashimi
Copy link
Member Author

/test e2e-gcp-op-techpreview

@isabella-janssen
Copy link
Member

/test e2e-gcp-op-ocl

@umohnani8
Copy link
Contributor

/retest

@umohnani8
Copy link
Contributor

/lgtm

@umohnani8
Copy link
Contributor

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

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented May 6, 2025

@umohnani8: Can not set label cherry-pick-approved: Must be member in one of these teams: []

In response to this:

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

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.

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label May 6, 2025
@umohnani8
Copy link
Contributor

/retest

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 6, 2025
@umohnani8
Copy link
Contributor

umohnani8 commented May 6, 2025 •
edited
Loading

/retitle MCO-1626: [release-4.18] backport OCL to 4.18

@openshift-ci openshift-ci bot changed the title [release-4.18] backport OCL to 4.18 MCO-1626 [release-4.18] backport OCL to 4.18 May 6, 2025
openshift-merge-bot bot and others added 16 commits May 22, 2025 10:20
@openshift-merge-bot @cheesesashimi
Merge pull request openshift#4753 from cheesesashimi/zzlotnik/incorpo…
a3e0753 
…rate-changes-to-helpers

MCO-1470: Incorporates upstream devex helper changes for OCL testing
@openshift-merge-bot @cheesesashimi
Merge pull request openshift#4741 from umohnani8/make
d56c4b6 
NO-ISSUE: Add AUTHFILE option to make image
@deads2k @cheesesashimi
Merge pull request openshift#4756 from djoshy/reconcile-ocl-api
d89cd05 
MCO-1437: MCO-1476: MCO-1477: MCO-1284: Adapt MCO to OCL v1 API
@openshift-merge-bot @cheesesashimi
Merge pull request openshift#4812 from djoshy/remove-entitled-copy
ee54d31 
NO-ISSUE: Remove etc-pki-entitlement cruft
@openshift-merge-bot @cheesesashimi
Merge pull request openshift#4817 from djoshy/unavail-ocl-debug
9986d14 
OCPBUGS-43552: maxUnavailable value is not honored when disabling OCL
@openshift-merge-bot @cheesesashimi
Merge pull request openshift#4868 from umohnani8/ext-tests
2ea5a1c 
No-Issue: Remove OCL Extensions test
@openshift-merge-bot @cheesesashimi
Merge pull request openshift#4811 from cheesesashimi/zzlotnik/OCPBUGS…
88a2398 
…-43896-rebase

OCPBUGS-48810: Ensure that build jobs are always reconciled
@openshift-merge-bot @cheesesashimi
Merge pull request openshift#4861 from umohnani8/ownership
b4df4fb 
OCPBUGS-44602: Set ownerReference for OCL build objects
@openshift-merge-bot @cheesesashimi
Merge pull request openshift#4825 from cheesesashimi/zzlotnik/OCPBUGS…
075542c 
…-43896

OCPBUGS-43896: add revert logic to OCL path in MCD
@openshift-merge-bot @cheesesashimi
Merge pull request openshift#4941 from cheesesashimi/zzlotnik/fix-e2e…
47d1830 
…-gcp-op-ocl

OCPBUGS-54161: use the same success criteria for OCL e2e tests
@openshift-merge-bot @cheesesashimi
Merge pull request openshift#4807 from umohnani8/rebuild
704f45d 
OCPBUGS-48675, OCPBUGS-48808, OCPBUGS-46421: Ensure build job is deleted when rebuild is triggered
@openshift-merge-bot @cheesesashimi
Merge pull request openshift#4833 from cheesesashimi/zzlotnik/fix-pro…
c0d8a0b 
…xy-restoration

OCPBUGS-49894: Ensure proxy config exists when reverting from OCL to non-OCL
@openshift-merge-bot @cheesesashimi
Merge pull request openshift#4924 from cheesesashimi/zzlotnik/fix-mcd…
b64fc2b 
…-and-node-controller

OCPBUGS-53408: wait for build and ensure OS image is actually new
@openshift-merge-bot @cheesesashimi
Merge pull request openshift#4975 from umohnani8/prune-3
651a609 
MCO-1558, OCPBUGS-34745: Add support to rebuild and prune OCL images
@openshift-merge-bot @cheesesashimi
Merge pull request openshift#4971 from umohnani8/disconnected-3
6821e8b 
MCO-1509: Enable OCL for disconnected workflow
@openshift-merge-bot @cheesesashimi
Merge pull request openshift#5054 from umohnani8/interruptbug
5c13110 
OCPBUGS-53390: Fix interrupt state to account for failure correctly
@cheesesashimi cheesesashimi force-pushed the zzlotnik/ocl-4.18-backport branch from bc5d2ed to 5c13110 Compare May 22, 2025 14:24
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 22, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented May 22, 2025

@cheesesashimi: 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/e2e-gcp-op-ocl 5c13110 link false /test e2e-gcp-op-ocl
ci/prow/okd-scos-e2e-aws-ovn 5c13110 link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-gcp-op-techpreview 5c13110 link false /test e2e-gcp-op-techpreview

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.

@umohnani8
Copy link
Contributor

/testwith openshift/machine-config-operator/release-4.18/e2e-gcp-op-ocl openshift/api#2316
/testwith openshift/machine-config-operator/release-4.18/e2e-gcp-op-techpreview openshift/api#2316

@umohnani8
Copy link
Contributor

/lgtm

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

openshift-ci bot commented May 27, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cheesesashimi, umohnani8

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 [cheesesashimi,umohnani8]

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

@mrunalp mrunalp added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label May 27, 2025
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD c2a7575 and 2 for PR HEAD 5c13110 in total

@umohnani8
Copy link
Contributor

/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 May 27, 2025
@mrunalp mrunalp merged commit 42bf13f into openshift:release-4.18 May 27, 2025
15 of 20 checks passed
@openshift-ci-robot
Copy link
Contributor

@cheesesashimi: Jira Issue OCPBUGS-52189: All pull requests linked via external trackers have merged:

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

In response to this:

- What I did

- How to verify it

- Description for the changelog
Backports OCL to 4.18.z

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-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-machine-config-operator
This PR has been included in build ose-machine-config-operator-container-v4.18.0-202505272134.p0.g42bf13f.assembly.stream.el9.
All builds following this will include this PR.

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

@RishabhSaini RishabhSaini Awaiting requested review from RishabhSaini

@umohnani8 umohnani8 Awaiting requested review from umohnani8

@sergiordlr sergiordlr Awaiting requested review from sergiordlr

Assignees

@rbbratta rbbratta

@eurijon eurijon

@zhaozhanqi zhaozhanqi

@umohnani8 umohnani8

@anuragthehatter anuragthehatter

@sergiordlr sergiordlr

@rlobillo rlobillo

@rioliu-rh rioliu-rh

@mhanss mhanss

@ptalgulk01 ptalgulk01

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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. 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.