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

Improve autobump documentation #20458

Merged
merged 1 commit into from
Jan 20, 2021

Conversation

mpherman2
Copy link
Contributor

Following up on comments from old PRs. Linked to godocs in the README and improved the comments for options to be more clear about what each field does and when it is required. If any of these fields are still ambiguous and need more clarification please let me know.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 12, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @mpherman2. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 12, 2021
@k8s-ci-robot k8s-ci-robot added the sig/testing Categorizes an issue or PR as relevant to SIG Testing. label Jan 12, 2021
@chaodaiG
Copy link
Contributor

/ok-to-test

This looks good to me.

/lgtm
/approve

/hold
In case @alvaroaleman is interested in taking a look

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 13, 2021
@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 13, 2021
StagingRefConfigFile string `yaml:"stagingRefConfigFile"`
//Repo used when generating pull request
// Repo used when generating pull request
Copy link
Member

Choose a reason for hiding this comment

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

Source or target repo?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure I understand exactly what is meant by source or target repo, but I updated the comment to more explicitly define what repo this field refers to and how it get used.

@spiffxp
Copy link
Member

spiffxp commented Jan 19, 2021

/test pull-test-infra-integration
#20498 (comment)

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 19, 2021
StagingRefConfigFile string `yaml:"stagingRefConfigFile"`
//Repo used when generating pull request
// Repo that the PR for the bump will be pushed to. This is used to generate comparison link in the PR summary.
Copy link
Member

Choose a reason for hiding this comment

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

What? Those are two different repos for everyone else: One repo the PR gets created against, one for the diffing

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, I tried to clarify the distinction between the different repos at play in my review comment. I think we're talking about at least 3 repos in total if we include the Bot's fork. We could even be talking about 4 if the reference file used to choose the next version to bump to is in another repo.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry about the misunderstanding. I was confused as to exactly how this was used and I was looking at an example where the source and target repo were the same. This refers to the source repo

StagingRefConfigFile string `yaml:"stagingRefConfigFile"`
//Repo used when generating pull request
// Repo that the PR for the bump will be pushed to. This is used to generate comparison link in the PR summary.
Copy link
Member

Choose a reason for hiding this comment

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

"Repo that the PR for the bump will be pushed to." is a bit confusing to me since we push the PR branch to the fork of the target repo, but the PR is created in the target repo itself.
Furthermore, the comparison link that is used in the PR summary should actually come from the upstream repo where the images are sourced in order to actually show the changes made between the old version and the version to which we are bumping.

So if we're bumping Prow images in GoogleCloudPlatform/oss-test-infra (the target repo), the fork would be something like bot-name/oss-test-infra and the source repo of the images to use for comparison links would be kubernetes/test-infra. Which of these repos is this field intended to represent? Do we need more fields to distinguish these?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh! This makes much more sense now. I was only looking at examples where the target and source repo were the same and so I was confused as to what the distinction was. This is meant to refer to the source repo. Thank you for the explanation

* summarise: Whether or not the format of the PR summary for this prefix should be summarised.
* consistentImages: Whether the prefix tags should be consistent after the bump

* For info about what should go in the config look at [the documentation for the Options here](https://github.com/kubernetes/test-infra/blob/0980814b76d8/experiment/autobumper/bumper/bumper.go#L86) and look at the example below.
Copy link
Member

Choose a reason for hiding this comment

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

Please link to the official GoDoc site instead: https://pkg.go.dev/k8s.io/test-infra/experiment/autobumper/bumper#Options
(Navigates more nicely and doesn't have to be pinned to a specific commit so it will automatically stay up to date.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@mpherman2 mpherman2 force-pushed the documentation_cleanup branch 2 times, most recently from 8257888 to 882fe0e Compare January 20, 2021 00:07
Copy link
Member

@alvaroaleman alvaroaleman left a comment

Choose a reason for hiding this comment

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

/hold
looks good from my perspective now, thanks for updating it!
Holding in case Cole has something to add

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 20, 2021
Copy link
Member

@cjwagner cjwagner left a comment

Choose a reason for hiding this comment

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

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 20, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alvaroaleman, chaodaiG, cjwagner, mpherman2

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

@k8s-ci-robot k8s-ci-robot merged commit 1e5cefe into kubernetes:master Jan 20, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Jan 20, 2021
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants