scality
[edit] CLDSRV-504: update arsenal package
Pull request template
Description
Motivation and context
This update of Cloudserver is required for implementing the new arsenal version with SSL secureTransport condition testing
Related issues
https://scality.atlassian.net/jira/software/c/projects/OS/boards/214?assignee=61360619c425a20068e9dfcb&selectedIssue=S3C-8124
Green Federation build with this iamge https://github.com/scality/Federation/pull/5484
Hello kaztoozs,
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.
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.
Integration data created
I have created the integration data for the additional destination branches.
- this pull request will merge
improvement/CLDSRV-504-arsenal-ssl-checkintodevelopment/7.10 - w/7.70/improvement/CLDSRV-504-arsenal-ssl-check will be merged into
development/7.70 - w/8.6/improvement/CLDSRV-504-arsenal-ssl-check will be merged into
development/8.6 - w/8.7/improvement/CLDSRV-504-arsenal-ssl-check will be merged into
development/8.7 - w/8.8/improvement/CLDSRV-504-arsenal-ssl-check will be merged into
development/8.8
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
The following options are set: create_integration_branches
Waiting for approval
The following approvals are needed before I can proceed with the merge:
-
the author
-
2 peers
The following options are set: create_integration_branches
History mismatch
Merge commit #a66f293217fdcac716ef54c0e419a837250db05c on the integration branch
w/7.70/improvement/CLDSRV-504-arsenal-ssl-check is merging a branch which is neither the current
branch improvement/CLDSRV-504-arsenal-ssl-check nor the development branch
development/7.70.
It is likely due to a rebase of the branch improvement/CLDSRV-504-arsenal-ssl-check and the
merge is not possible until all related w/* branches are deleted or updated.
Please use the reset command to have me reinitialize these branches.
The following options are set: create_integration_branches
History mismatch
Merge commit #c5e5fcf99b7cd4201e674053aaf2fe166de7a5da on the integration branch
w/7.70/improvement/CLDSRV-504-arsenal-ssl-check is merging a branch which is neither the current
branch improvement/CLDSRV-504-arsenal-ssl-check nor the development branch
development/7.70.
It is likely due to a rebase of the branch improvement/CLDSRV-504-arsenal-ssl-check and the
merge is not possible until all related w/* branches are deleted or updated.
Please use the reset command to have me reinitialize these branches.
The following options are set: create_integration_branches
Reset complete
I have successfully deleted this pull request's integration branches.
The following options are set: create_integration_branches
Conflict
A conflict has been raised during the creation of
integration branch w/7.70/improvement/CLDSRV-504-arsenal-ssl-check with contents from improvement/CLDSRV-504-arsenal-ssl-check
and development/7.70.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/7.70/improvement/CLDSRV-504-arsenal-ssl-check origin/development/7.70
$ git merge origin/improvement/CLDSRV-504-arsenal-ssl-check
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.70/improvement/CLDSRV-504-arsenal-ssl-check
The following options are set: create_integration_branches