Skip to content

Backport CLDSRV-621: Support bucket owner#5832

Merged
bert-e merged 7 commits intodevelopment/7.70from
improvement/CLDSRV-621-backport-bucketownerid
Jun 23, 2025
Merged

Backport CLDSRV-621: Support bucket owner#5832
bert-e merged 7 commits intodevelopment/7.70from
improvement/CLDSRV-621-backport-bucketownerid

Conversation

@BourgoisMickael
Copy link
Copy Markdown
Contributor

Backport #5785

Because S3C 9.5 still uses branch development/7.70

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Jun 20, 2025

Hello bourgoismickael,

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
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/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
Copy link
Copy Markdown
Contributor

bert-e commented Jun 20, 2025

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.

@BourgoisMickael BourgoisMickael force-pushed the improvement/CLDSRV-621-backport-bucketownerid branch from 70006f5 to a1149f4 Compare June 20, 2025 17:24
@BourgoisMickael BourgoisMickael force-pushed the improvement/CLDSRV-621-backport-bucketownerid branch from a1149f4 to 52a2ada Compare June 20, 2025 17:35
@BourgoisMickael BourgoisMickael requested a review from tmacro June 20, 2025 17:47
@BourgoisMickael BourgoisMickael force-pushed the improvement/CLDSRV-621-backport-bucketownerid branch from 52a2ada to 612b824 Compare June 20, 2025 18:05
@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

/create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Jun 20, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/8.8/improvement/CLDSRV-621-backport-bucketownerid with contents from improvement/CLDSRV-621-backport-bucketownerid
and development/8.8.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.8/improvement/CLDSRV-621-backport-bucketownerid origin/development/8.8
 $ git merge origin/improvement/CLDSRV-621-backport-bucketownerid
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.8/improvement/CLDSRV-621-backport-bucketownerid

The following options are set: create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Jun 20, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/9.0/improvement/CLDSRV-621-backport-bucketownerid with contents from w/8.8/improvement/CLDSRV-621-backport-bucketownerid
and development/9.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/9.0/improvement/CLDSRV-621-backport-bucketownerid origin/development/9.0
 $ git merge origin/w/8.8/improvement/CLDSRV-621-backport-bucketownerid
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/9.0/improvement/CLDSRV-621-backport-bucketownerid

The following options are set: create_integration_branches

@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

/create_pull_requests

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Jun 20, 2025

Integration data created

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

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4

Follow integration pull requests if you would like to be notified of
build statuses by email.

The following options are set: create_pull_requests, create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Jun 20, 2025

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_pull_requests, create_integration_branches

@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

/approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Jun 20, 2025

Build failed

The build for commit did not succeed in branch w/8.8/improvement/CLDSRV-621-backport-bucketownerid

The following options are set: approve, create_pull_requests, create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Jun 23, 2025

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

  • ✔️ development/7.70

  • ✔️ development/8.8

  • ✔️ development/9.0

  • ✔️ development/9.1

The following branches have NOT changed:

  • development/7.10
  • development/7.4

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

Goodbye bourgoismickael.

The following options are set: approve, create_pull_requests, create_integration_branches

@bert-e bert-e merged commit 612b824 into development/7.70 Jun 23, 2025
17 checks passed
@bert-e bert-e deleted the improvement/CLDSRV-621-backport-bucketownerid branch June 23, 2025 09:45
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