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.

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

OCPBUGS-17157: scripts: add a Go-based bumper, sync upstream #534

Merged
merged 7 commits into from Aug 15, 2023
Merged

OCPBUGS-17157: scripts: add a Go-based bumper, sync upstream #534

merged 7 commits into from Aug 15, 2023

Conversation

stevekuznetsov
Copy link
Contributor

scripts: add a Go-based bumper

This script sohuld be easier to maintain, automate, and have less
historical baggage as compared to the shell scripts. As an example, the
problem space of "cherry-pick some small number of commits on top of an
in-sync branch" is much smaller than the "cherry-pick some unknownn
number of commits on some dirty branch state with out-of-order commits
already present."

Signed-off-by: Steve Kuznetsov skuznets@redhat.com

@stevekuznetsov stevekuznetsov changed the title scripts: add a Go-based bumper, sync upstream OCPBUGS-17157: scripts: add a Go-based bumper, sync upstream Aug 7, 2023
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 7, 2023
@openshift-ci-robot
Copy link

@stevekuznetsov: This pull request references Jira Issue OCPBUGS-17157, which is invalid:

  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

scripts: add a Go-based bumper

This script sohuld be easier to maintain, automate, and have less
historical baggage as compared to the shell scripts. As an example, the
problem space of "cherry-pick some small number of commits on top of an
in-sync branch" is much smaller than the "cherry-pick some unknownn
number of commits on some dirty branch state with out-of-order commits
already present."

Signed-off-by: Steve Kuznetsov skuznets@redhat.com

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.

@stevekuznetsov stevekuznetsov mentioned this pull request Aug 7, 2023
Closed
38 tasks
@stevekuznetsov
Copy link
Contributor Author

Depends on #533

grokspawn
grokspawn reviewed Aug 7, 2023
View reviewed changes
pkg/manifests/csv.yaml Outdated Show resolved Hide resolved
@stevekuznetsov
Copy link
Contributor Author

/retest

@stevekuznetsov
Copy link
Contributor Author

Needs operator-framework/operator-lifecycle-manager#3007

@openshift-ci-robot openshift-ci-robot mentioned this pull request Aug 8, 2023
Merged
@stevekuznetsov
scripts: add a Go-based bumper
ad54e7b 
This script sohuld be easier to maintain, automate, and have less
historical baggage as compared to the shell scripts. As an example, the
problem space of "cherry-pick some small number of commits on top of an
in-sync branch" is much smaller than the "cherry-pick some unknownn
number of commits on some dirty branch state with out-of-order commits
already present."

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
@stevekuznetsov
operators/olm: record and expose infromers (#3005)
abe998d 
Plugins should re-use informers that the host started, since there's no
need to double the number of watches and caches we're doing to reconcile
the same set of objects in one process.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: a7f102afe51f8873d36499674ec674f62895585d
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
@stevekuznetsov
queueinformer: don't double register informers (#3007)
6559b84 
The abstraction here doesn't let you re-use an informer without also
causing it to be re-registered and re-started, which is invalid.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 2be5e58b153eea608b6da16a8e3a1c46bc6c5b87
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
@stevekuznetsov
Copy link
Contributor Author

Rebased, should be ready

@stevekuznetsov
Copy link
Contributor Author

/retest

@stevekuznetsov
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 8, 2023
@openshift-ci-robot
Copy link

@stevekuznetsov: This pull request references Jira Issue OCPBUGS-17157, which is valid.

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

Requesting review from QA contact:
/cc @jianzhangbjz

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 kubernetes/test-infra repository.

@stevekuznetsov
Copy link
Contributor Author

Can't reproduce the unit failure locally...

$ go test -count 1 ./pkg/controller/operators/olm/plugins/...
ok  	github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/plugins	1.715s

@stevekuznetsov
Copy link
Contributor Author

/retest

@stevekuznetsov
Copy link
Contributor Author

/test all

@stevekuznetsov stevekuznetsov force-pushed the skuznets/sync-upstream branch 2 times, most recently from dd5db47 to 769b1e9 Compare August 15, 2023 13:42
@tmshort
Copy link
Contributor

tmshort commented Aug 15, 2023

Missing one at least one upstream commit... but it's just OWNERS update, which doesn't really matter.

tmshort
tmshort suggested changes Aug 15, 2023
View reviewed changes
Copy link
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.

Some concerns around the bumper; the other stuff looks fine.

scripts/verify_commits.sh Show resolved Hide resolved
scripts/bumper/main.go Show resolved Hide resolved
scripts/bumper/main.go Outdated Show resolved Hide resolved
scripts/bumper/main.go Show resolved Hide resolved
@stevekuznetsov
scripts: allow explicit downstream carries
818efa2 
We have code in this repository that is explicitly added as long-term
carries in the staging directory. This commit allows labeling those
carries and not failing on them.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
@stevekuznetsov
[CARRY] downstream_csv_namespace_labeler: use shared informers
0aa7042 
Consume the informers that the host operator exposes in order to reduce
resource consumption. A more straightforward approach would have been to
share the shared informer factory itself, but that would have been more
involved.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
@stevekuznetsov
bumper: use a non-breaking space for delimiting output
389369d 
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
@stevekuznetsov
scripts,Make: add a generate-manifests target
f22a85b 
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
tmshort
tmshort reviewed Aug 15, 2023
View reviewed changes
scripts/README.md
Comment on lines -89 to -91
## TODO
# Long-lived Carry Commits

* Add `make verify` to the `sync_pop_candidate.sh` and/or `sync.sh` scripts.
Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for removing this.

tmshort
tmshort approved these changes Aug 15, 2023
View reviewed changes
Copy link
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

The sync scripts should be updated once we're confident in these changes.

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

openshift-ci bot commented Aug 15, 2023

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Aug 15, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 15, 2023

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

@openshift-merge-robot openshift-merge-robot merged commit f2de7eb into openshift:master Aug 15, 2023
12 checks passed
@openshift-ci-robot
Copy link

@stevekuznetsov: Jira Issue OCPBUGS-17157: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-17157 has not been moved to the MODIFIED state.

In response to this:

scripts: add a Go-based bumper

This script sohuld be easier to maintain, automate, and have less
historical baggage as compared to the shell scripts. As an example, the
problem space of "cherry-pick some small number of commits on top of an
in-sync branch" is much smaller than the "cherry-pick some unknownn
number of commits on some dirty branch state with out-of-order commits
already present."

Signed-off-by: Steve Kuznetsov skuznets@redhat.com

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.

This was referenced Aug 21, 2023
Merged
Merged
Merged
This was referenced Sep 5, 2023
Merged
Merged
Merged
@openshift-ci-robot openshift-ci-robot mentioned this pull request Sep 18, 2023
Merged
This was referenced Sep 26, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joelanford joelanford joelanford left review comments

@grokspawn grokspawn grokspawn left review comments

@tmshort tmshort tmshort approved these changes

@ankitathomas ankitathomas Awaiting requested review from ankitathomas

@jianzhangbjz jianzhangbjz Awaiting requested review from jianzhangbjz

Assignees

@tmshort tmshort

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. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@stevekuznetsov @openshift-ci-robot @tmshort @joelanford @grokspawn @openshift-merge-robot