Scuba and Quotas

[williamlardier]

• Bump project version
• Introduce Scuba in Zenko
• CTST tests for quotas

[bert-e]

Hello williamlardier,

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]

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.

[williamlardier]

/create_integration_branches

[bert-e]

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

[williamlardier]

/force_reset

[bert-e]

Reset complete

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

The following options are set: create_integration_branches

[bert-e]

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

[bert-e]

History mismatch

Merge commit #99735a20372956b564ef9b4b2b4aaf7158dae2e6 on the integration branch w/2.7/feature/ZENKO-4789-scuba-and-quotas is merging a branch which is neither the current branch feature/ZENKO-4789-scuba-and-quotas nor the development branch development/2.7.

It is likely due to a rebase of the branch feature/ZENKO-4789-scuba-and-quotas 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

[bert-e]

Reset complete

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

The following options are set: create_integration_branches

[bert-e]

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

[bert-e]

History mismatch

Merge commit #8fd3293f13ba3c4fe7040e9d5119b32b31150209 on the integration branch w/2.9/feature/ZENKO-4789-scuba-and-quotas is merging a branch which is neither the current branch feature/ZENKO-4789-scuba-and-quotas nor the development branch development/2.9.

It is likely due to a rebase of the branch feature/ZENKO-4789-scuba-and-quotas 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

[williamlardier]

/force_reset

[bert-e]

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

[bert-e]

Reset complete

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

The following options are set: create_integration_branches

[bert-e]

Integration data created

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

• this pull request will merge feature/ZENKO-4789-scuba-and-quotas into development/2.6
• w/2.7/feature/ZENKO-4789-scuba-and-quotas will be merged into development/2.7
• w/2.8/feature/ZENKO-4789-scuba-and-quotas will be merged into development/2.8
• w/2.9/feature/ZENKO-4789-scuba-and-quotas will be merged into development/2.9

The following branches will NOT be impacted:

• development/2.5

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

[bert-e]

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

[bert-e]

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

[bert-e]

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

[bert-e]

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

[bert-e]

Conflict

A conflict has been raised during the creation of integration branch w/2.9/feature/ZENKO-4789-scuba-and-quotas with contents from w/2.8/feature/ZENKO-4789-scuba-and-quotas and development/2.9.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.9/feature/ZENKO-4789-scuba-and-quotas origin/development/2.9
 $ git merge origin/w/2.8/feature/ZENKO-4789-scuba-and-quotas
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.9/feature/ZENKO-4789-scuba-and-quotas

The following options are set: create_integration_branches

[bert-e]

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

[williamlardier]

/approve

[bert-e]

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

• :heavy_check_mark: development/2.6

• :heavy_check_mark: development/2.7

• :heavy_check_mark: development/2.8

• :heavy_check_mark: development/2.9

The following branches have NOT changed:

• development/2.5

Please check the status of the associated issue ZENKO-4789.

Goodbye williamlardier.

The following options are set: approve, create_integration_branches