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

Improvement/zk UI 311 azure archive location #542

Merged
merged 9 commits into from
Mar 23, 2023

Conversation

MonPote
Copy link
Contributor

@MonPote MonPote commented Feb 24, 2023

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Feb 24, 2023

Hello monpote,

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 24, 2023

Incorrect fix version

The Fix Version/s in issue ZKUI-311 contains:

  • None

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

  • 1.6.11

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

@MonPote MonPote force-pushed the improvement/ZKUI-311-azure-archive-location branch 2 times, most recently from e994c4c to fb3f56e Compare March 3, 2023 14:17
@MonPote MonPote force-pushed the improvement/ZKUI-311-azure-archive-location branch from 5da5611 to 178d8ec Compare March 17, 2023 16:08
@MonPote MonPote marked this pull request as ready for review March 17, 2023 16:09
@bert-e
Copy link
Contributor

bert-e commented Mar 17, 2023

Conflict

There is a conflict between your branch improvement/ZKUI-311-azure-archive-location and the
destination branch development/1.6.

Please resolve the conflict on the feature branch (improvement/ZKUI-311-azure-archive-location).

git fetch && \
git checkout origin/improvement/ZKUI-311-azure-archive-location && \
git merge origin/development/1.6

Resolve merge conflicts and commit

git push origin HEAD:improvement/ZKUI-311-azure-archive-location

@bert-e
Copy link
Contributor

bert-e commented Mar 21, 2023

Waiting for approval

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

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

}
/>
</FormSection>
<FormSection title={{ name: 'Queue' }} forceLabelWidth={210}>
Copy link
Contributor

Choose a reason for hiding this comment

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

To check why there is no separation line between the form sections.

@MonPote MonPote force-pushed the improvement/ZKUI-311-azure-archive-location branch 2 times, most recently from 2c67052 to c27763f Compare March 23, 2023 13:23
@MonPote MonPote changed the base branch from development/1.6 to development/2.0 March 23, 2023 17:23
@bert-e
Copy link
Contributor

bert-e commented Mar 23, 2023

Incorrect fix version

The Fix Version/s in issue ZKUI-311 contains:

  • 1.6.11

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

  • 2.0.0

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

@MonPote
Copy link
Contributor Author

MonPote commented Mar 23, 2023

ping

@bert-e
Copy link
Contributor

bert-e commented Mar 23, 2023

Waiting for approval

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

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@MonPote
Copy link
Contributor Author

MonPote commented Mar 23, 2023

/approve

@bert-e
Copy link
Contributor

bert-e commented Mar 23, 2023

Queue out of order

The changeset has received all authorizations to enter the merge queue,
however the merge queue is currently in an incoherent state. In order
to protect this pull request, I have not added the changeset to the
queue.

Look into https://devdocs.scality.net/support/faq/#bert-e for guidance about
what to do next to unlock the situation, or ask for help on the #ci-support
Slack channel.

The following options are set: approve

@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (development/2.0@5f7b49c). Click here to learn what that means.
The diff coverage is n/a.

@@                Coverage Diff                 @@
##             development/2.0     #542   +/-   ##
==================================================
  Coverage                   ?   54.35%           
==================================================
  Files                      ?      197           
  Lines                      ?     9420           
  Branches                   ?     2628           
==================================================
  Hits                       ?     5120           
  Misses                     ?     4281           
  Partials                   ?       19           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@MonPote
Copy link
Contributor Author

MonPote commented Mar 23, 2023

/help

@bert-e
Copy link
Contributor

bert-e commented Mar 23, 2023

Help page

The following options and commands are available at this time.

Options

name description privileged authored
➡️ approve Instruct Bert-E that the author has approved the pull request. ✍️
➡️ bypass_build_status Bypass the build and test status
➡️ unanimity Change review acceptance criteria from one reviewer at least to all reviewers
➡️ after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
➡️ bypass_author_approval Bypass the pull request author's approval
➡️ wait Instruct Bert-E not to run until further notice.
➡️ bypass_leader_approval Bypass the pull request leaders' approval
➡️ bypass_jira_check Bypass the Jira issue check
➡️ 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
➡️ create_pull_requests Allow the creation of integration pull requests.
➡️ bypass_peer_approval Bypass the pull request peers' approval
➡️ bypass_commit_size Bypass the check on the size of the changeset TBA

Commands

name description privileged
➡️ reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.
➡️ status Print Bert-E's current status in the pull request TBA
➡️ build Re-start a fresh build TBA
➡️ clear Remove all comments from Bert-E from the history 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.
➡️ retry Re-start a fresh build TBA

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 23, 2023

Queue out of order

The changeset has received all authorizations to enter the merge queue,
however the merge queue is currently in an incoherent state. In order
to protect this pull request, I have not added the changeset to the
queue.

Look into https://devdocs.scality.net/support/faq/#bert-e for guidance about
what to do next to unlock the situation, or ask for help on the #ci-support
Slack channel.

The following options are set: approve

@MonPote
Copy link
Contributor Author

MonPote commented Mar 23, 2023

/reset

@bert-e
Copy link
Contributor

bert-e commented Mar 23, 2023

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 23, 2023

Queue out of order

The changeset has received all authorizations to enter the merge queue,
however the merge queue is currently in an incoherent state. In order
to protect this pull request, I have not added the changeset to the
queue.

Look into https://devdocs.scality.net/support/faq/#bert-e for guidance about
what to do next to unlock the situation, or ask for help on the #ci-support
Slack channel.

The following options are set: approve

@MonPote
Copy link
Contributor Author

MonPote commented Mar 23, 2023

/reset

@bert-e
Copy link
Contributor

bert-e commented Mar 23, 2023

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 23, 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/2.0

The following branches will NOT be impacted:

  • development/1.4
  • development/1.5
  • development/1.6

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 23, 2023

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

  • ✔️ development/2.0

The following branches have NOT changed:

  • development/1.4
  • development/1.5
  • development/1.6

Please check the status of the associated issue ZKUI-311.

Goodbye monpote.

@bert-e bert-e merged commit b6e0663 into development/2.0 Mar 23, 2023
@bert-e bert-e deleted the improvement/ZKUI-311-azure-archive-location branch March 23, 2023 19:31
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.

5 participants