Skip to content

OPRUN-1873: scripts/bumper: automate pushing changes and creating PRs#550

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
stevekuznetsov:skuznets/bumper-prs
Aug 22, 2023
Merged

OPRUN-1873: scripts/bumper: automate pushing changes and creating PRs#550
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
stevekuznetsov:skuznets/bumper-prs

Conversation

@stevekuznetsov
Copy link
Copy Markdown
Contributor

No description provided.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Comment thread scripts/bumper/main.go
Comment on lines +169 to +179
var missingCommits []commit
for _, commit := range commits {
commitLogger := logger.WithField("commit", commit.Hash)
missing, err := isCommitMissing(ctx, commitLogger, opts.stagingDir, commit)
if err != nil {
commitLogger.WithError(err).Fatal("failed to determine if commit is missing")
}
if missing {
missingCommits = append(missingCommits, commit)
}
}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Wondering why this is necessary given detectNewCommits()? This isn't moved from elsewhere like cherryPickAll below.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

While testing, I found it really useful to keep track of all the commits that need to be cherry-picked, even if some have already been picked. I added the centralRef flag to mark the start of our search, and this check to ensure we don't try to cherry-pick a commit more than once. This is not as necessary for the cherry-picks themselves, but was crucial for making sure the table of commits in the PR we send is full, even if the last invocation of this tool that pushes the PR did not do every single cherry-pick.

@stevekuznetsov
Copy link
Copy Markdown
Contributor Author

/retest

2 similar comments
@stevekuznetsov
Copy link
Copy Markdown
Contributor Author

/retest

@tmshort
Copy link
Copy Markdown
Contributor

tmshort commented Aug 21, 2023

/retest

@tmshort
Copy link
Copy Markdown
Contributor

tmshort commented Aug 21, 2023

/retest
(Is this the definition of insanity?)

@stevekuznetsov
Copy link
Copy Markdown
Contributor Author

Yes, let's override it and move on - there's no world in which the content of this PR can influence that test...

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 21, 2023

@stevekuznetsov: all tests passed!

Full PR test history. Your PR dashboard.

Details

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/test-infra repository. I understand the commands that are listed here.

@stevekuznetsov
Copy link
Copy Markdown
Contributor Author

Speak of the devil...

Copy link
Copy Markdown
Contributor

@tmshort tmshort left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 22, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 22, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ncdc, stevekuznetsov, tmshort

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 Aug 22, 2023
@ncdc
Copy link
Copy Markdown
Contributor

ncdc commented Aug 22, 2023

This is a developer tool and doesn't impact anything in the payload. No bug required; manually adding jira/valid-bug label, as per conversation with @bparees.

@ncdc ncdc added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Aug 22, 2023
@openshift-merge-robot openshift-merge-robot merged commit f8d481f into openshift:master Aug 22, 2023
@stevekuznetsov stevekuznetsov changed the title scripts/bumper: automate pushing changes and creating PRs OPRUN-1873: scripts/bumper: automate pushing changes and creating PRs Aug 28, 2023
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-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants