Skip to content

Conversation

dusk125
Copy link

@dusk125 dusk125 commented May 30, 2025

The go version in the go.mod file is usually now in the form major.minor.patch instead of just major.minor. Our openshift images are just major.minor which causes the rebase script to fail. This fix correctly strips the patch off of a go version, if it exists in the go mod, so that rebase pulls the right openshift image.

@openshift-ci-robot openshift-ci-robot added the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label May 30, 2025
@openshift-ci-robot
Copy link

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

The following commits could not be validated and must be approved by a top-level approver:

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

@openshift-ci openshift-ci bot requested review from deads2k and p0lyn0mial May 30, 2025 14:45
@dusk125 dusk125 changed the title NOJIRA: Update rebase.sh to handle go versions major.minor.patch UPSTREAM: <carry>: Update rebase.sh to handle go versions major.minor.patch Jun 20, 2025
@dusk125
Copy link
Author

dusk125 commented Jun 20, 2025

/assign @bertinatto

@dusk125
Copy link
Author

dusk125 commented Jun 20, 2025

/cherry-pick release-4.19

@openshift-cherrypick-robot

@dusk125: once the present PR merges, I will cherry-pick it on top of release-4.19 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.19

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

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

The following commits could not be validated and must be approved by a top-level approver:

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

Copy link
Member

@bertinatto bertinatto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/remove-label backports/unvalidated-commits
/lgtm

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. and removed backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. labels Jun 20, 2025
Copy link

openshift-ci bot commented Jun 20, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Jun 20, 2025
@dusk125
Copy link
Author

dusk125 commented Jun 20, 2025

/retest-required

Copy link

openshift-ci bot commented Jun 20, 2025

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

@dusk125
Copy link
Author

dusk125 commented Jun 24, 2025

/retitle NOJIRA: UPSTREAM: : Update rebase.sh to handle go versions major.minor.patch

@openshift-ci openshift-ci bot changed the title UPSTREAM: <carry>: Update rebase.sh to handle go versions major.minor.patch NOJIRA: UPSTREAM: <carry>: Update rebase.sh to handle go versions major.minor.patch Jun 24, 2025
@dusk125
Copy link
Author

dusk125 commented Jun 24, 2025

/jira refresh

@openshift-ci-robot
Copy link

@dusk125: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

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.

@dusk125 dusk125 changed the title NOJIRA: UPSTREAM: <carry>: Update rebase.sh to handle go versions major.minor.patch NO-JIRA: UPSTREAM: <carry>: Update rebase.sh to handle go versions major.minor.patch Jun 24, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 24, 2025
@openshift-ci-robot
Copy link

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

In response to this:

The go version in the go.mod file is usually now in the form major.minor.patch instead of just major.minor. Our openshift images are just major.minor which causes the rebase script to fail. This fix correctly strips the patch off of a go version, if it exists in the go mod, so that rebase pulls the right openshift image.

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-merge-bot openshift-merge-bot bot merged commit 62bb9f3 into openshift:master Jun 24, 2025
24 checks passed
@openshift-cherrypick-robot

@dusk125: new pull request created: #2341

In response to this:

/cherry-pick release-4.19

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

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-pod
This PR has been included in build openshift-enterprise-pod-container-v4.20.0-202506241811.p0.g62bb9f3.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: kube-proxy
This PR has been included in build kube-proxy-container-v4.20.0-202506241811.p0.g62bb9f3.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-hyperkube
This PR has been included in build openshift-enterprise-hyperkube-container-v4.20.0-202506241811.p0.g62bb9f3.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-kube-apiserver-artifacts
This PR has been included in build ose-installer-kube-apiserver-artifacts-container-v4.20.0-202506241811.p0.g62bb9f3.assembly.stream.el9.
All builds following this will include this PR.

@dusk125 dusk125 deleted the fix-rebase branch June 25, 2025 00:53
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.

5 participants