Skip to content

[release-4.18] NO-JIRA: Fix the failures in qe ci jobs #380

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

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #374

/assign sunzhaohua2

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 17, 2025

@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: OCPQE-27285

In response to this:

This is an automated cherry-pick of #374

/assign sunzhaohua2

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 damdo and racheljpg February 17, 2025 03:38
@sunzhaohua2
Copy link
Contributor

/retest

Copy link
Contributor

openshift-ci bot commented Feb 18, 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.

@sunzhaohua2
Copy link
Contributor

@JoelSpeed can you help to add labels to merge?

@JoelSpeed
Copy link
Contributor

/approve
/lgtm
/label backport-risk-assessed

@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 Feb 19, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 19, 2025
Copy link
Contributor

openshift-ci bot commented Feb 19, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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 Feb 19, 2025
@sunzhaohua2
Copy link
Contributor

/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 Feb 19, 2025
@sunzhaohua2
Copy link
Contributor

I need to open a bug or we can merge this directly by adding a label manually?

@damdo
Copy link
Member

damdo commented Feb 20, 2025

Try with NO-JIRA in front of the PR title (after the release bit).
Not sure that will work but it is worth trying.
Also we'll likely need to wait until 4.18 is GA, as this requires steff-eng approved label

@sunzhaohua2
Copy link
Contributor

/retitle [release-4.18] NO-JIRA: Fix the failures in qe ci jobs

@openshift-ci openshift-ci bot changed the title [release-4.18] OCPQE-27285: Fix the failures in qe ci jobs [release-4.18] NO-JIRA: Fix the failures in qe ci jobs Feb 20, 2025
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request explicitly references no jira issue.

In response to this:

This is an automated cherry-pick of #374

/assign sunzhaohua2

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/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 20, 2025
@damdo
Copy link
Member

damdo commented Feb 20, 2025

@JoelSpeed will probably also need to add the jira/valid-bug label

@JoelSpeed JoelSpeed added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Feb 20, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit a47963c into openshift:release-4.18 Feb 25, 2025
10 checks passed
@sunzhaohua2
Copy link
Contributor

/cherry-pick release-4.17 release-4.16 release-4.15 release-4.14 release-4.13 release-4.12

@openshift-cherrypick-robot
Copy link
Author

@sunzhaohua2: #380 failed to apply on top of branch "release-4.17":

Applying: Fix the failures in qe ci jobs
Using index info to reconstruct a base tree...
M	pkg/framework/framework.go
M	pkg/framework/machinesets.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/framework/machinesets.go
Auto-merging pkg/framework/framework.go
CONFLICT (content): Merge conflict in pkg/framework/framework.go
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 Fix the failures in qe ci jobs

In response to this:

/cherry-pick release-4.17 release-4.16 release-4.15 release-4.14 release-4.13 release-4.12

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.

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

7 participants