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

LOG-2243: remove grafana-dashboard-cluster-logging on removing clusterlogging/instance #1505

Merged
merged 1 commit into from
Jun 16, 2022

Conversation

vparfonov
Copy link
Contributor

@vparfonov vparfonov commented Jun 13, 2022

Signed-off-by: Vitalii Parfonov vparfono@redhat.com

Description

/cc
/assign @jcantrill

/cherry-pick

Links

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 13, 2022

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 13, 2022
@openshift-ci openshift-ci bot requested review from syedriko and vimalk78 June 13, 2022 12:34
@vparfonov vparfonov marked this pull request as ready for review June 13, 2022 12:36
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 13, 2022
@openshift-ci openshift-ci bot requested a review from jcantrill June 13, 2022 12:37
@vparfonov
Copy link
Contributor Author

/cherry-pick release-5.4

@openshift-cherrypick-robot

@vparfonov: once the present PR merges, I will cherry-pick it on top of release-5.4 in a new PR and assign it to you.

In response to this:

/cherry-pick release-5.4

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.

@jcantrill
Copy link
Contributor

/approve
/lgtm

@openshift-ci openshift-ci bot added lgtm 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 Jun 15, 2022
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 2 against base HEAD daae1e6 and 8 for PR HEAD ca1529e in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 1 against base HEAD daae1e6 and 7 for PR HEAD ca1529e in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD daae1e6 and 6 for PR HEAD ca1529e in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 2 against base HEAD f8ef74b and 5 for PR HEAD ca1529e in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 1 against base HEAD f8ef74b and 4 for PR HEAD ca1529e in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD f8ef74b and 3 for PR HEAD ca1529e in total

@vparfonov
Copy link
Contributor Author

/retest

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 2 against base HEAD 93ae7ca and 2 for PR HEAD ca1529e in total

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 16, 2022
…rlogging/instance

Signed-off-by: Vitalii Parfonov <vparfono@redhat.com>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 16, 2022

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

Copy link
Contributor

@jcantrill jcantrill 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 Jun 16, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 16, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcantrill, vparfonov

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 merged commit 6c7cf78 into openshift:master Jun 16, 2022
@openshift-cherrypick-robot

@vparfonov: #1505 failed to apply on top of branch "release-5.4":

Applying: LOG-2243: remove grafana-dashboard-cluster-logging on removing clusterlogging/instance
Using index info to reconstruct a base tree...
M	controllers/clusterlogging/clusterlogging_controller.go
M	internal/metrics/dashboards.go
Falling back to patching base and 3-way merge...
Auto-merging internal/metrics/dashboards.go
CONFLICT (content): Merge conflict in internal/metrics/dashboards.go
Auto-merging controllers/clusterlogging/clusterlogging_controller.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 LOG-2243: remove grafana-dashboard-cluster-logging on removing clusterlogging/instance
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-5.4

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.

@vparfonov vparfonov deleted the log2243x branch June 21, 2022 07:20
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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants