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

[release-4.18] OCPBUGS-52496: use non-fake boot image for patch #29584

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #29574

/assign theobarberbany

/cherrypick release-4.17 release-4.16 release-4.15 release-4.14 release-4.13

@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Detected clone of Jira Issue OCPBUGS-51373 with correct target version. Will retitle the PR to link to the clone.
/retitle [release-4.18] OCPBUGS-52496: use non-fake boot image for patch

In response to this:

This is an automated cherry-pick of #29574

/assign theobarberbany

/cherrypick release-4.17 release-4.16 release-4.15 release-4.14 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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot changed the title [release-4.18] OCPBUGS-51373: use non-fake boot image for patch [release-4.18] OCPBUGS-52496: use non-fake boot image for patch Mar 6, 2025
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 6, 2025
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-52496, 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 #29574

/assign theobarberbany

/cherrypick release-4.17 release-4.16 release-4.15 release-4.14 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 openshift-eng/jira-lifecycle-plugin repository.

@djoshy
Copy link
Contributor

djoshy commented Mar 6, 2025

/lgtm
/label backport-risk-assessed

/cherrypick release-4.17 release-4.16 release-4.15 release-4.14 release-4.13

This test is new in 4.18 so we don't need more backports 😄

Copy link
Contributor

openshift-ci bot commented Mar 6, 2025

@djoshy: Can not set label backport-risk-assessed: Must be member in one of these teams: [openshift-staff-engineers]

In response to this:

/lgtm
/label backport-risk-assessed

/cherrypick release-4.17 release-4.16 release-4.15 release-4.14 release-4.13

This test is new in 4.18 so we don't need more backports 😄

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 lgtm Indicates that a PR is ready to be merged. label Mar 6, 2025
Copy link
Contributor

openshift-ci bot commented Mar 6, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, 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:

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 Mar 6, 2025
@theobarberbany
Copy link
Contributor

/retest

@theobarberbany
Copy link
Contributor

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 14, 2025
@openshift-ci-robot
Copy link

@theobarberbany: This pull request references Jira Issue OCPBUGS-52496, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.z) matches configured target version for branch (4.18.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-51373 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-51373 targets the "4.19.0" version, which is one of the valid target versions: 4.19.0
  • bug has dependents

Requesting review from QA contact:
/cc @sunzhaohua2

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.

@openshift-ci openshift-ci bot requested a review from sunzhaohua2 March 14, 2025 15:04
@shellyyang1989
Copy link

/retest

@shellyyang1989
Copy link

@stbenjam could you please help label backport-risk-assessed? Thanks

@shellyyang1989
Copy link

@xingxingxia could you please help label cherry-pick-approved? Thanks

@xingxingxia
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 17, 2025
@sdodson sdodson added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Mar 28, 2025
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 68b6d98 and 2 for PR HEAD bea9d86 in total

2 similar comments
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 68b6d98 and 2 for PR HEAD bea9d86 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 68b6d98 and 2 for PR HEAD bea9d86 in total

Copy link
Contributor

openshift-ci bot commented Mar 31, 2025

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

@openshift-merge-bot openshift-merge-bot bot merged commit 6df37be into openshift:release-4.18 Mar 31, 2025
29 checks passed
@openshift-ci-robot
Copy link

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

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

In response to this:

This is an automated cherry-pick of #29574

/assign theobarberbany

/cherrypick release-4.17 release-4.16 release-4.15 release-4.14 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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-cherrypick-robot
Copy link
Author

@openshift-cherrypick-robot: #29584 failed to apply on top of branch "release-4.17":

Applying: GCP: use non-fake boot image for patch
Using index info to reconstruct a base tree...
A	test/extended/machine_config/helpers.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/extended/machine_config/helpers.go deleted in HEAD and modified in GCP: use non-fake boot image for patch. Version GCP: use non-fake boot image for patch of test/extended/machine_config/helpers.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 GCP: use non-fake boot image for patch

In response to this:

This is an automated cherry-pick of #29574

/assign theobarberbany

/cherrypick release-4.17 release-4.16 release-4.15 release-4.14 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-sigs/prow repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-tests
This PR has been included in build openshift-enterprise-tests-container-v4.18.0-202503312303.p0.g6df37be.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
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/severity-important Referenced Jira bug's severity is important 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
Development

Successfully merging this pull request may close these issues.