search

scality / cloudserver

Zenko CloudServer, an open-source Node.js implementation of the Amazon S3 protocol on the front-end and backend storage capabilities to multiple clouds, including Azure and Google.
https://www.zenko.io/cloudserver
Apache License 2.0
1.71k stars 241 forks source link

CLDSRV-565 Global default SSE configuration #5684

Closed nicolas2bert closed 1 week ago

nicolas2bert commented 2 weeks ago

This PR:

bert-e commented 2 weeks ago

Hello nicolas2bert,

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.

Available options name | description | privileged | authored ------ | ------------ | ------------ |---------- `/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 | :star: | `/bypass_build_status` | Bypass the build and test status | :star: | `/bypass_commit_size` | Bypass the check on the size of the changeset ```TBA``` | :star: | `/bypass_incompatible_branch` | Bypass the check on the source branch prefix | :star: | `/bypass_jira_check` | Bypass the Jira issue check | :star: | `/bypass_peer_approval` | Bypass the pull request peers' approval | :star: | `/bypass_leader_approval` | Bypass the pull request leaders' approval | :star: | `/approve` | Instruct Bert-E that the author has approved the pull request. | | :writing_hand: `/create_pull_requests` | Allow the creation of integration pull requests. | | `/create_integration_branches` | Allow the creation of integration branches. | | `/no_octopus` | Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead | | `/unanimity` | Change review acceptance criteria from `one reviewer at least` to `all reviewers` | | `/wait` | Instruct Bert-E not to run until further notice. | |
Available commands name | description | privileged ------ | ------------ | ------------ `/help` | Print Bert-E's manual in the pull request. | `/status` | Print Bert-E's current status in the pull request ```TBA``` | `/clear` | Remove all comments from Bert-E from the history ```TBA``` | `/retry` | Re-start a fresh build ```TBA``` | `/build` | Re-start a fresh build ```TBA``` | `/force_reset` | Delete integration branches & pull requests, and restart merge process from the beginning. | `/reset` | Try to remove integration branches unless there are commits on them which do not appear on the source branch. |

Status report is not available.

bert-e commented 2 weeks ago

Incorrect fix version

The Fix Version/s in issue CLDSRV-565 contains:

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

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

nicolas2bert commented 2 weeks ago

ping

bert-e commented 2 weeks ago

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically create the integration branches.

nicolas2bert commented 1 week ago

@bert-e approve

bert-e commented 1 week ago

Conflict

A conflict has been raised during the creation of integration branch w/8.6/improvement/CLDSRV-565/global-sse with contents from improvement/CLDSRV-565/global-sse and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/improvement/CLDSRV-565/global-sse origin/development/8.6
 $ git merge origin/improvement/CLDSRV-565/global-sse
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/improvement/CLDSRV-565/global-sse

The following options are set: approve

bert-e commented 1 week ago

Integration data created

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

The following branches will NOT be impacted:

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

The following options are set: approve

bert-e commented 1 week ago

Build failed

The build for commit did not succeed in branch w/8.6/improvement/CLDSRV-565/global-sse.

The following options are set: approve

bert-e commented 1 week ago

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:

The following branches will NOT be impacted:

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.

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

nicolas2bert commented 1 week ago

@bert-e approve

bert-e commented 1 week ago

Queue build failed

The corresponding build for the queue failed:

Remove the pull request from the queue - Add a `/wait` comment on this pull request. - Click on login on the [status page](https://bert-e.scality.net/scality/cloudserver). - Go into the [manage](https://bert-e.scality.net/scality/cloudserver/manage) page. - Find the option called `Rebuild the queue` and click on it. Bert-E will loop again on all pull requests to put the valid ones in the queue again, while skipping the one with the `/wait` comment. - Wait for the new queue to merge, then merge/rebase your pull request with the latest changes to then work on a proper fix. - Once the issue is fixed, delete the `/wait` comment and follow the usual process to merge the pull request.
bert-e commented 1 week ago

Incorrect fix version

The Fix Version/s in issue CLDSRV-565 contains:

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

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

The following options are set: approve

nicolas2bert commented 1 week ago

ping

bert-e commented 1 week ago

Queue build failed

The corresponding build for the queue failed:

Remove the pull request from the queue - Add a `/wait` comment on this pull request. - Click on login on the [status page](https://bert-e.scality.net/scality/cloudserver). - Go into the [manage](https://bert-e.scality.net/scality/cloudserver/manage) page. - Find the option called `Rebuild the queue` and click on it. Bert-E will loop again on all pull requests to put the valid ones in the queue again, while skipping the one with the `/wait` comment. - Wait for the new queue to merge, then merge/rebase your pull request with the latest changes to then work on a proper fix. - Once the issue is fixed, delete the `/wait` comment and follow the usual process to merge the pull request.
nicolas2bert commented 1 week ago

@bert-e reset

bert-e commented 1 week ago

Lossy reset warning

There seems to be manual commits on integration branches (e.g. conflict resolutions) that will be lost if you chose to reset.

You can use the force_reset command if you still want me to delete those branches.

The following options are set: approve

bert-e commented 1 week ago

Queue build failed

The corresponding build for the queue failed:

Remove the pull request from the queue - Add a `/wait` comment on this pull request. - Click on login on the [status page](https://bert-e.scality.net/scality/cloudserver). - Go into the [manage](https://bert-e.scality.net/scality/cloudserver/manage) page. - Find the option called `Rebuild the queue` and click on it. Bert-E will loop again on all pull requests to put the valid ones in the queue again, while skipping the one with the `/wait` comment. - Wait for the new queue to merge, then merge/rebase your pull request with the latest changes to then work on a proper fix. - Once the issue is fixed, delete the `/wait` comment and follow the usual process to merge the pull request.
nicolas2bert commented 1 week ago

@bert-e force_reset

bert-e commented 1 week ago

Reset complete

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

The following options are set: approve

bert-e commented 1 week ago

Queue build failed

The corresponding build for the queue failed:

Remove the pull request from the queue - Add a `/wait` comment on this pull request. - Click on login on the [status page](https://bert-e.scality.net/scality/cloudserver). - Go into the [manage](https://bert-e.scality.net/scality/cloudserver/manage) page. - Find the option called `Rebuild the queue` and click on it. Bert-E will loop again on all pull requests to put the valid ones in the queue again, while skipping the one with the `/wait` comment. - Wait for the new queue to merge, then merge/rebase your pull request with the latest changes to then work on a proper fix. - Once the issue is fixed, delete the `/wait` comment and follow the usual process to merge the pull request.
bert-e commented 1 week ago

Partial merge

Apparently, new commits were added to the source branch after I had queued this Pull Request. As a result, I have merged only part of it into the targetted development branches:

I will now work on the following commits:

Please avoid this situation next time.

As a friendly reminder, you can use the wait command to prevent me from processing your pull-request while your work is still in progress.

bert-e commented 1 week ago

Conflict

There is a conflict between your branch improvement/CLDSRV-565/global-sse and the destination branch development/7.70.

Please resolve the conflict on the feature branch (improvement/CLDSRV-565/global-sse).

git fetch && \
git checkout origin/improvement/CLDSRV-565/global-sse && \
git merge origin/development/7.70

Resolve merge conflicts and commit

git push origin HEAD:improvement/CLDSRV-565/global-sse

The following options are set: approve

bert-e commented 1 week ago

Conflict

A conflict has been raised during the creation of integration branch w/8.6/improvement/CLDSRV-565/global-sse with contents from improvement/CLDSRV-565/global-sse and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/improvement/CLDSRV-565/global-sse origin/development/8.6
 $ git merge origin/improvement/CLDSRV-565/global-sse
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/improvement/CLDSRV-565/global-sse

The following options are set: approve

bert-e commented 1 week ago

Integration data created

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

The following branches will NOT be impacted:

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

The following options are set: approve

bert-e commented 1 week ago

Build failed

The build for commit did not succeed in branch w/8.6/improvement/CLDSRV-565/global-sse.

The following options are set: approve

bert-e commented 1 week ago

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

The following branches have NOT changed:

Please check the status of the associated issue CLDSRV-565.

Goodbye nicolas2bert.

The following options are set: approve