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.

Sign up for GitHub

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

Jump to bottom

CLDSRV529: Bump utapi #5571

Merged
merged 2 commits into from
May 17, 2024
Merged

CLDSRV529: Bump utapi #5571

merged 2 commits into from
May 17, 2024

Conversation

tmacro
Copy link
Contributor

@tmacro tmacro commented May 16, 2024

No description provided.

@bert-e
Copy link
Contributor

bert-e commented May 16, 2024

Hello tmacro,

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.

@scality scality deleted a comment from bert-e May 16, 2024
@bert-e
Copy link
Contributor

bert-e commented May 16, 2024

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.

@tmacro
Copy link
Contributor Author

tmacro commented May 16, 2024

/create_integration_branches

@scality scality deleted a comment from bert-e May 16, 2024
@scality scality deleted a comment from bert-e May 16, 2024
@bert-e
Copy link
Contributor

bert-e commented May 16, 2024

Integration data created

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

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

@bert-e
Copy link
Contributor

bert-e commented May 16, 2024

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

@tmacro tmacro changed the title Bugfix/cldsrv 529/bump utapi CLDSRV529: Bump utapi May 16, 2024
@tmacro
Copy link
Contributor Author

tmacro commented May 16, 2024

/approve

@bert-e
Copy link
Contributor

bert-e commented May 16, 2024

Build failed

The build for commit did not succeed in branch w/7.70/bugfix/CLDSRV-529/bump_utapi.

The following options are set: approve, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented May 16, 2024

History mismatch

Merge commit #3d1af980d9fc5cff223150f1125371cc9bef0200 on the integration branch
w/8.6/bugfix/CLDSRV-529/bump_utapi is merging a branch which is neither the current
branch bugfix/CLDSRV-529/bump_utapi nor the development branch
development/8.6.

It is likely due to a rebase of the branch bugfix/CLDSRV-529/bump_utapi 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: approve, create_integration_branches

@anurag4DSB
Copy link
Contributor

/reset

@bert-e
Copy link
Contributor

bert-e commented May 17, 2024

Reset complete

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

The following options are set: approve, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented May 17, 2024

Conflict

A conflict has been raised during the creation of
integration branch w/7.70/bugfix/CLDSRV-529/bump_utapi with contents from bugfix/CLDSRV-529/bump_utapi
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/bugfix/CLDSRV-529/bump_utapi origin/development/7.70
 $ git merge origin/bugfix/CLDSRV-529/bump_utapi
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/CLDSRV-529/bump_utapi

The following options are set: approve, create_integration_branches

@anurag4DSB
Copy link
Contributor

ping

@bert-e
Copy link
Contributor

bert-e commented May 17, 2024

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/bugfix/CLDSRV-529/bump_utapi with contents from w/7.70/bugfix/CLDSRV-529/bump_utapi
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/bugfix/CLDSRV-529/bump_utapi origin/development/8.6
 $ git merge origin/w/7.70/bugfix/CLDSRV-529/bump_utapi
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/bugfix/CLDSRV-529/bump_utapi

The following options are set: approve, create_integration_branches

@anurag4DSB
Copy link
Contributor

ping

@bert-e
Copy link
Contributor

bert-e commented May 17, 2024

Integration data created

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

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: approve, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented May 17, 2024

Build failed

The build for commit did not succeed in branch w/8.6/bugfix/CLDSRV-529/bump_utapi.

The following options are set: approve, create_integration_branches

@nicolas2bert
Copy link
Contributor

ping

@bert-e
Copy link
Contributor

bert-e commented May 17, 2024

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

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.6

  • ✔️ development/8.7

  • ✔️ development/8.8

The following branches have NOT changed:

  • development/7.4

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

Goodbye tmacro.

The following options are set: approve, create_integration_branches

@bert-e bert-e merged commit 4f34a34 into development/7.10 May 17, 2024
10 checks passed
@bert-e bert-e deleted the bugfix/CLDSRV-529/bump_utapi branch May 17, 2024 13:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anurag4DSB anurag4DSB anurag4DSB approved these changes

@jonathan-gramain jonathan-gramain jonathan-gramain approved these changes

@rachedbenmustapha rachedbenmustapha rachedbenmustapha approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@tmacro @bert-e @anurag4DSB @nicolas2bert @jonathan-gramain @rachedbenmustapha