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

impr: BB-361 update metric names #2367

Merged
merged 1 commit into from
Mar 2, 2023

Conversation

naren-rajendran
Copy link

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Feb 16, 2023

Hello naren-rajendran,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Feb 16, 2023

Incorrect fix version

The Fix Version/s in issue BB-361 contains:

  • None

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.8

  • 8.3.20

  • 8.4.26

  • 8.5.5

  • 8.6.6

Please check the Fix Version/s of BB-361, or the target
branch of this pull request.

Copy link
Contributor

@nicolas2bert nicolas2bert left a comment

Choose a reason for hiding this comment

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

Note: dashboards and alerts would need to be updated for development/8.x branches.

@naren-rajendran
Copy link
Author

Note: dashboards and alerts would need to be updated for development/8.x branches.

Yes.. I will make changes in the integration branches.

@naren-rajendran naren-rajendran force-pushed the improvement/BB-361-metric-name-updates branch from 85c5cfa to 7f29d47 Compare March 1, 2023 07:01
@naren-rajendran
Copy link
Author

@bert-e help

@bert-e
Copy link
Contributor

bert-e commented Mar 1, 2023

Help page

The following options and commands are available at this time.

Options

name description privileged authored
➡️ create_pull_requests Allow the creation of integration pull requests.
➡️ bypass_peer_approval Bypass the pull request peers' approval
➡️ unanimity Change review acceptance criteria from one reviewer at least to all reviewers
➡️ bypass_leader_approval Bypass the pull request leaders' approval
➡️ no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
➡️ bypass_incompatible_branch Bypass the check on the source branch prefix
➡️ wait Instruct Bert-E not to run until further notice.
➡️ bypass_jira_check Bypass the Jira issue check
➡️ bypass_author_approval Bypass the pull request author's approval
➡️ approve Instruct Bert-E that the author has approved the pull request. ✍️
➡️ after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
➡️ bypass_commit_size Bypass the check on the size of the changeset TBA
➡️ bypass_build_status Bypass the build and test status

Commands

name description privileged
➡️ status Print Bert-E's current status in the pull request TBA
➡️ retry Re-start a fresh build TBA
➡️ force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
➡️ help Print Bert-E's manual in the pull request.
➡️ build Re-start a fresh build TBA
➡️ reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.
➡️ clear Remove all comments from Bert-E from the history TBA

@bert-e
Copy link
Contributor

bert-e commented Mar 1, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/8.3/improvement/BB-361-metric-name-updates with contents from improvement/BB-361-metric-name-updates
and development/8.3.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.3/improvement/BB-361-metric-name-updates origin/development/8.3
 $ git merge origin/improvement/BB-361-metric-name-updates
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.3/improvement/BB-361-metric-name-updates

@bert-e
Copy link
Contributor

bert-e commented Mar 1, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/8.4/improvement/BB-361-metric-name-updates with contents from w/8.3/improvement/BB-361-metric-name-updates
and development/8.4.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.4/improvement/BB-361-metric-name-updates origin/development/8.4
 $ git merge origin/w/8.3/improvement/BB-361-metric-name-updates
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.4/improvement/BB-361-metric-name-updates

@bert-e
Copy link
Contributor

bert-e commented Mar 2, 2023

Incorrect fix version

The Fix Version/s in issue BB-361 contains:

  • 7.10.8

  • 8.3.20

  • 8.4.26

  • 8.5.5

  • 8.6.6

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.9

  • 8.3.20

  • 8.4.26

  • 8.5.5

  • 8.6.6

Please check the Fix Version/s of BB-361, or the target
branch of this pull request.

@scality scality deleted a comment from bert-e Mar 2, 2023
@bert-e
Copy link
Contributor

bert-e commented Mar 2, 2023

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Mar 2, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@naren-rajendran
Copy link
Author

@bert-e approve

@bert-e
Copy link
Contributor

bert-e commented Mar 2, 2023

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/7.10

  • ✔️ development/8.3

  • ✔️ development/8.4

  • ✔️ development/8.5

  • ✔️ development/8.6

The following branches will NOT be impacted:

  • development/7.4

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 2, 2023

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/7.10

  • ✔️ development/8.3

  • ✔️ development/8.4

  • ✔️ development/8.5

  • ✔️ development/8.6

The following branches have NOT changed:

  • development/7.4

Please check the status of the associated issue BB-361.

Goodbye naren-rajendran.

@bert-e bert-e merged commit 54f2b40 into development/7.10 Mar 2, 2023
@bert-e bert-e deleted the improvement/BB-361-metric-name-updates branch March 2, 2023 08:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants