Skip to content

OCPBUGS-60610: UPSTREAM: 134199: Promote regression-issue-74839 to 1.4 #2472

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
Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OCPBUGS-60610: UPSTREAM: 134199: Promote regression-issue-74839 to 1.4 #2472

wants to merge 1 commit into from
+1 −1

Conversation

arkadeepsen
Copy link
Member

What type of PR is this?

/kind bug

What this PR does / why we need it:

The bug was reported upstream in kubernetes#134116. The fix needed a change in the server code in the regression-issue-74839 image. This fix needed 3 separate PRs:

This PR is only a cherry-pick of kubernetes#134199 as that's the PR which actually fixes the bug. The changes in kubernetes#134164 can be brought in through the rebase process itself.

$ git cherry-pick 25893cb579a1ac8622ae0d9a652a320c8e732de5

The following conflict was resolved in test/utils/image/manifest.go by keeping the redis image:

<<<<<<< HEAD
	configs[Redis] = Config{list.PromoterE2eRegistry, "redis", "5.0.5-3"}
	configs[RegressionIssue74839] = Config{list.PromoterE2eRegistry, "regression-issue-74839", "1.2"}
=======
	configs[RegressionIssue74839] = Config{list.PromoterE2eRegistry, "regression-issue-74839", "1.4"}
>>>>>>> 25893cb579a (Promote regression-issue-74839 to 1.4)

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@openshift-ci-robot openshift-ci-robot added the backports/validated-commits Indicates that all commits come to merged upstream PRs. label Sep 24, 2025
@openshift-ci openshift-ci bot added the kind/bug Categorizes issue or PR as related to a bug. label Sep 24, 2025
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Sep 24, 2025
@openshift-ci-robot
Copy link

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

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.21.0) matches configured target version for branch (4.21.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

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

In response to this:

What type of PR is this?

/kind bug

What this PR does / why we need it:

The bug was reported upstream in kubernetes#134116. The fix needed a change in the server code in the regression-issue-74839 image. This fix needed 3 separate PRs:

This PR is only a cherry-pick of kubernetes#134199 as that's the PR which actually fixes the bug. The changes in kubernetes#134164 can be brought in through the rebase process itself.

$ git cherry-pick 25893cb579a1ac8622ae0d9a652a320c8e732de5

The following conflict was resolved in test/utils/image/manifest.go by keeping the redis image:

<<<<<<< HEAD
  configs[Redis] = Config{list.PromoterE2eRegistry, "redis", "5.0.5-3"}
  configs[RegressionIssue74839] = Config{list.PromoterE2eRegistry, "regression-issue-74839", "1.2"}
=======
  configs[RegressionIssue74839] = Config{list.PromoterE2eRegistry, "regression-issue-74839", "1.4"}
>>>>>>> 25893cb579a (Promote regression-issue-74839 to 1.4)

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

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

@arkadeepsen: the contents of this pull request could be automatically validated.

The following commits are valid:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

@bertinatto
Copy link
Member

/retest

3 similar comments
@arkadeepsen
Copy link
Member Author

/retest

@arkadeepsen
Copy link
Member Author

/retest

@arkadeepsen
Copy link
Member Author

/retest

@arkadeepsen
Copy link
Member Author

/retest-required

5 similar comments
@arkadeepsen
Copy link
Member Author

/retest-required

@arkadeepsen
Copy link
Member Author

/retest-required

@arkadeepsen
Copy link
Member Author

/retest-required

@arkadeepsen
Copy link
Member Author

/retest-required

@arkadeepsen
Copy link
Member Author

/retest-required

@bertinatto
Copy link
Member

/lgtm

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

openshift-ci bot commented Oct 3, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: arkadeepsen, bertinatto

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 Oct 3, 2025
@weliang1
Copy link

weliang1 commented Oct 3, 2025

/verified by @weliang

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Oct 3, 2025
@openshift-ci-robot
Copy link

@weliang1: This PR has been marked as verified by @weliang.

In response to this:

/verified by @weliang

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

/retest-required

Remaining retests: 0 against base HEAD ecfa8cc and 2 for PR HEAD 6a8be42 in total

@arkadeepsen
Copy link
Member Author

/retest-required

1 similar comment
@arkadeepsen
Copy link
Member Author

/retest-required

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Oct 7, 2025

@arkadeepsen: 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-aws-ovn-techpreview 6a8be42 link false /test e2e-aws-ovn-techpreview
ci/prow/okd-scos-e2e-aws-ovn 6a8be42 link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-aws-ovn-techpreview-serial 6a8be42 link false /test e2e-aws-ovn-techpreview-serial
ci/prow/e2e-aws-ovn-serial 6a8be42 link true /test e2e-aws-ovn-serial

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.

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

@bertinatto bertinatto Awaiting requested review from bertinatto

@deads2k deads2k Awaiting requested review from deads2k

Assignees

@bertinatto bertinatto

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backports/validated-commits Indicates that all commits come to merged upstream PRs. 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. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@arkadeepsen @openshift-ci-robot @bertinatto @weliang1