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

Bug 1952576: Emit CSV metric on startup #239

Merged
merged 2 commits into from
Jan 11, 2022
Merged

Bug 1952576: Emit CSV metric on startup #239

merged 2 commits into from
Jan 11, 2022

Conversation

timflannagan
Copy link
Contributor

No description provided.

Josef Karasek and others added 2 commits January 5, 2022 14:30
@timflannagan
Emit CSV metric on startup (#2216)
91b949a 
Signed-off-by: Josef Karasek <jkarasek@redhat.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: de4bebe06ba076f804d28c594d7dc52dfd95ef20
@akihikokuroda @timflannagan
fix e2e CSV metric is preserved failure (#2530)
7baca83 
Signed-off-by: akihikokuroda <akihikokuroda2020@gmail.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 33b081aca79dcfc33895a5c114976c4f284f027f
@openshift-ci 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 Jan 5, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 5, 2022

@timflannagan: This pull request references Bugzilla bug 1952576, 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.10.0) matches configured target release for branch (4.10.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

Bug 1952576: Emit CSV metric on startup

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 5, 2022
@timflannagan
Copy link
Contributor Author

/retest

@perdasilva
Copy link
Contributor

/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 5, 2022

@perdasilva: changing LGTM is restricted to collaborators

In response to this:

/lgtm

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.

@timflannagan
Copy link
Contributor Author

/retest

1 similar comment
@timflannagan
Copy link
Contributor Author

/retest

dinhxuanvu
dinhxuanvu approved these changes Jan 10, 2022
View reviewed changes
Copy link
Member

@dinhxuanvu dinhxuanvu 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 Jan 10, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 10, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dinhxuanvu, timflannagan

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:
  • OWNERS [dinhxuanvu,timflannagan]

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

@timflannagan
Copy link
Contributor Author

/retest

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 11, 2022

@timflannagan: 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 79c7825 into openshift:master Jan 11, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 11, 2022

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

Bugzilla bug 1952576 has been moved to the MODIFIED state.

In response to this:

Bug 1952576: Emit CSV metric on startup

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.

@timflannagan timflannagan deleted the bz-1952576 branch January 11, 2022 01:35
@perdasilva
Copy link
Contributor

/cherry-pick release-4.9

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Apr 7, 2022
Merged
@openshift-cherrypick-robot
Copy link

@perdasilva: new pull request created: #280

In response to this:

/cherry-pick release-4.9

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.

@anik120
Copy link
Contributor

anik120 commented Apr 11, 2022

/cherry-pick release-4.8

@openshift-cherrypick-robot
Copy link

@anik120: #239 failed to apply on top of branch "release-4.8":

Applying: Emit CSV metric on startup (#2216)
Using index info to reconstruct a base tree...
M	staging/operator-lifecycle-manager/cmd/olm/main.go
M	staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
M	staging/operator-lifecycle-manager/test/e2e/metrics_e2e_test.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/cmd/olm/main.go
M	vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
Auto-merging vendor/github.com/operator-framework/operator-lifecycle-manager/cmd/olm/main.go
Auto-merging staging/operator-lifecycle-manager/test/e2e/metrics_e2e_test.go
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/test/e2e/metrics_e2e_test.go
Auto-merging staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go
Auto-merging staging/operator-lifecycle-manager/cmd/olm/main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Emit CSV metric on startup (#2216)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.8

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.

@anik120 anik120 mentioned this pull request Apr 12, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dinhxuanvu dinhxuanvu dinhxuanvu approved these changes

@jianzhangbjz jianzhangbjz Awaiting requested review from jianzhangbjz

@gallettilance gallettilance Awaiting requested review from gallettilance

@kevinrizza kevinrizza Awaiting requested review from kevinrizza

Assignees

@dinhxuanvu dinhxuanvu

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. 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.
8 participants
@timflannagan @perdasilva @openshift-bot @openshift-cherrypick-robot @anik120 @dinhxuanvu @openshift-merge-robot @akihikokuroda