Bug 2007647: Add squash-merge support into oc adm release info #1116

ardaguclu · 2022-04-26T10:07:38Z

Repositories, like insights-operator, use squash-merge and
oc adm release info --changes-from does not show changes for these repos.

This PR adds handling also squash merging and shows changes.

Repositories, like insights-operator, use squash-merge and `oc adm release info --changes-from` does not show changes for these repos. This PR adds handling also squash merging and shows changes.

openshift-ci · 2022-04-26T10:07:46Z

@ardaguclu: This pull request references Bugzilla bug 2007647, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.11.0) matches configured target release for branch (4.11.0)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @zhouying7780

Details

In response to this:

Bug 2007647: Add squash-merge support into oc adm release info

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.

ardaguclu · 2022-04-26T10:09:10Z

/uncc @smarterclayton
/cc @deejross

ardaguclu · 2022-04-26T12:36:13Z

/retest

rosspeoples · 2022-04-26T13:42:49Z

/lgtm

ardaguclu · 2022-04-26T14:59:33Z

/test e2e-metal-ipi-ovn-ipv6

soltysh

/approve

openshift-ci · 2022-04-26T18:29:06Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ardaguclu, deejross, soltysh

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:

~~pkg/cli/admin/release/OWNERS~~ [soltysh]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci · 2022-04-26T18:30:39Z

@ardaguclu: All pull requests linked via external trackers have merged:

openshift/oc#1116

Bugzilla bug 2007647 has been moved to the MODIFIED state.

Details

In response to this:

Bug 2007647: Add squash-merge support into oc adm release info

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.

openshift-ci · 2022-04-26T18:30:55Z

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

wking · 2022-04-27T08:24:57Z

pkg/cli/admin/release/git.go

 var (
-	rePR     = regexp.MustCompile(`^Merge pull request #(\d+) from`)
-	rePrefix = regexp.MustCompile(`^(\[[\w\.\-]+\]\s*)+`)
+	squashRePR = regexp.MustCompile(`#(\d+)`)


Looking at Insights history:

$ git clone --depth 10 --branch release-4.11 https://github.com/openshift/insights-operator.git $ cd insights-operator $ git --no-pager log --no-merges --topo-order HEAD^^^.. commit 95961e7113ce179bf1621ac38842cad691d5b870 (HEAD -> release-4.11, origin/release-4.11) Author: Tomas Remes <[email protected]> Date: Fri Apr 22 20:03:08 2022 +0200 Fix vendoring of the build-machinery-go (#613) commit 8f0ed50a6e1eaecf66650e364ee676339697c4ad Author: Tomas Remes <[email protected]> Date: Thu Apr 21 16:23:10 2022 +0200 Minor gatherer documentation update (#606) commit 91b6fb4e66f52d44696ad6c3bd4cf06aae290dfe Author: Tomas Remes <[email protected]> Date: Thu Apr 21 16:23:03 2022 +0200 Create a new Prometheus metric providing Insights gathering time (#600) * Create a new Prometheus metric providing Insights gathering time * Rename the metric

Perhaps this regexp should require the wrapping parens too?

This regexp extracts;

Fix vendoring of the build-machinery-go (#613) Minor gatherer documentation update (#606) Create a new Prometheus metric providing Insights gathering time (#600)

What do you mean by "wrapping parents"?

It will also match 123 in

Fix vendoring from #123 (#613)

Using [(]#(\d+)[)] or similar will only match 613.

You are totally right @wking, thanks. I'll open a fix PR.

…mmits Originally, the change-log generation focused on merge commits, which are common in many repositories. For example, in this 'oc' repository: $ git log --graph --oneline -10 * 559c67e (HEAD -> main, origin/main) Merge pull request openshift#2083 from wking/oc-adm-upgrade-recommend-certificate-authority |\ | * b98b2e1 pkg/cli/admin/inspectalerts: Pass through --certificate-authority, etc. * | e7900fe Merge pull request openshift#2082 from ardaguclu/code-rabbit-test |\ \ | |/ |/| | * ffe752e Remove mentioning about IRC channel from README * | f114b17 OTA-1581: Promote `oc adm upgrade status` to general availability (openshift#2063) * | 1c54ec0 Merge pull request openshift#2077 from hongkailiu/OTA-1601 |\ \ | * | 5f1dbb8 Move not-lines-related table.Write out of the loop | * | a352662 Truncate long reasons | * | 11f9f47 Reproduce the long reason issue | * | 970f883 status: improve line break handling for CO Message 4299014 (Add squash-merge support into oc adm release info, 2022-04-26, openshift#1116), and mentioned the insights operator: $ git clone --depth 10 --branch master https://github.com/openshift/insights-operator $ cd insights-operator $ git log --graph --oneline -5 * da45333 (HEAD -> master, origin/master, origin/HEAD) OCPBUGS-60611: virt launcher logs gatherer (openshift#1110) * 737b59b fix: incorrect anonymization of domains (openshift#1111) * b5185da feat: add permissions to gather clusterrole (openshift#1106) * 3099eb0 feat: Allow on-demand gathering during initial periodic run (openshift#1109) * 7f8b40d RFE-4152: Add missing readonlyRootFilesystem (openshift#1104) But some repositories also use a mixture of real merges and squash or rebase merges: $ git clone --depth 20 --branch main https://github.com/openshift/operator-framework-operator-controller $ cd operator-framework-operator-controller $ git log --graph --oneline -11 * 9319f22a (HEAD -> main, origin/main, origin/HEAD) UPSTREAM: <carry>: Ensure unique name for bad-catalog tests * 9b50498a UPSTREAM: <carry>: Adds ResourceVersion checks to the tls secret deletion test, mirroring the logic used in the certificate rotation test. This makes the test more robust by ensuring a new secret is created, not just that an existing one is still present. * 2ed1a5c8 UPSTREAM: <carry>: Migrate single/own namespace tests * 0c4f4303 UPSTREAM: <carry>: [OTE] add catalog tests from openshift/origin * 28299f38 UPSTREAM: <carry>: remove obsolete owners * 5aa7897f UPSTREAM: <carry>: [OTE] - Readme:Add info to help use payload-aggregate with new tests * 0bb19537 UPSTREAM: <carry>: Adds ResourceVersion checks to the tls secret deletion test, mirroring the logic used in the certificate rotation test. This makes the test more robust by ensuring a new secret is created, not just that an existing one is still present. * e9e3220f UPSTREAM: <carry>: [OTE] Add webhook to validate openshift-service-ca certificate rotation * a7d35272 Merge pull request openshift#453 from openshift-bot/synchronize-upstream |\ | * d93f9d16 UPSTREAM: <drop>: configure the commit-checker | * 9a69e8ed UPSTREAM: <drop>: remove upstream GitHub configuration Before this commit, the logic would find the merge commits, assume that all content came in via merge commits, and not mention the other changes: $ git log --first-parent --merges --oneline a7d3527 Merge pull request openshift#453 from openshift-bot/synchronize-upstream 4cae159 Merge pull request openshift#449 from openshift-bot/synchronize-upstream 82f63dc Merge pull request openshift#444 from openshift-bot/synchronize-upstream 6f91d84 Merge pull request openshift#435 from openshift-bot/synchronize-upstream With this commit, we'll continue to include a line for each of those merges. But we'll also include the count of any elided, non-merge, first-parent commits: $ git log --first-parent --no-merges --oneline | wc -l 16 Folks interested in what exactly was elided will have to click through to 'Full changelog' or otherwise go digging. But at least they'll get the count of elided commits to know that there is more information there to see behind that click.

Add squash-merge support into oc adm release info

4299014

Repositories, like insights-operator, use squash-merge and `oc adm release info --changes-from` does not show changes for these repos. This PR adds handling also squash merging and shows changes.

openshift-ci bot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Apr 26, 2022

openshift-ci bot requested review from smarterclayton, soltysh and zhouying7780 April 26, 2022 10:07

openshift-ci bot requested review from rosspeoples and removed request for smarterclayton April 26, 2022 10:09

openshift-ci bot assigned rosspeoples Apr 26, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 26, 2022

soltysh approved these changes Apr 26, 2022

View reviewed changes

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 26, 2022

openshift-merge-robot merged commit 9b7fe72 into openshift:master Apr 26, 2022

ardaguclu deleted the bug-2007647 branch April 26, 2022 18:49

wking reviewed Apr 27, 2022

View reviewed changes

ardaguclu mentioned this pull request Apr 28, 2022

Fix squash merge regex #1118

Merged

wking mentioned this pull request Aug 29, 2025

OCPBUGS-60989: pkg/cli/admin/release/info: Mention elided first-parent, non-merge commits #2086

Merged

Bug 2007647: Add squash-merge support into oc adm release info #1116

Bug 2007647: Add squash-merge support into oc adm release info #1116

Uh oh!

Conversation

ardaguclu commented Apr 26, 2022

Uh oh!

openshift-ci bot commented Apr 26, 2022

Uh oh!

ardaguclu commented Apr 26, 2022

Uh oh!

ardaguclu commented Apr 26, 2022

Uh oh!

rosspeoples commented Apr 26, 2022

Uh oh!

ardaguclu commented Apr 26, 2022

Uh oh!

soltysh left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Apr 26, 2022

Uh oh!

openshift-ci bot commented Apr 26, 2022

Uh oh!

openshift-ci bot commented Apr 26, 2022

Uh oh!

wking Apr 27, 2022

Choose a reason for hiding this comment

Uh oh!

ardaguclu Apr 27, 2022

Choose a reason for hiding this comment

Uh oh!

wking Apr 27, 2022

Choose a reason for hiding this comment

Uh oh!

ardaguclu Apr 27, 2022

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants