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

ARTESCA-9658 retry for ETCd backup #4168

Merged
merged 1 commit into from
Oct 4, 2023
Merged

ARTESCA-9658 retry for ETCd backup #4168

merged 1 commit into from
Oct 4, 2023

Conversation

aprucolimartins
Copy link
Contributor

@aprucolimartins aprucolimartins requested a review from a team as a code owner October 2, 2023 14:03
@bert-e
Copy link
Contributor

bert-e commented Oct 2, 2023

Hello aprucolimartins,

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.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Oct 2, 2023

Integration data created

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

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

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

@bert-e
Copy link
Contributor

bert-e commented Oct 2, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@bert-e
Copy link
Contributor

bert-e commented Oct 3, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@aprucolimartins aprucolimartins force-pushed the feature/ARTESCA-9658_retry_for_ETCd_backup branch from 210c7c9 to dfa29e5 Compare October 3, 2023 15:45
@bert-e
Copy link
Contributor

bert-e commented Oct 3, 2023

History mismatch

Merge commit #210c7c9eb5b48eb1f1d3c9fd39b8beac3e4aaf59 on the integration branch
w/126.0/feature/ARTESCA-9658_retry_for_ETCd_backup is merging a branch which is neither the current
branch feature/ARTESCA-9658_retry_for_ETCd_backup nor the development branch
development/126.0.

It is likely due to a rebase of the branch feature/ARTESCA-9658_retry_for_ETCd_backup 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.

@aprucolimartins
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Oct 3, 2023

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented Oct 3, 2023

Integration data created

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

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

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

@bert-e
Copy link
Contributor

bert-e commented Oct 3, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@bert-e
Copy link
Contributor

bert-e commented Oct 3, 2023

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.

@aprucolimartins aprucolimartins force-pushed the feature/ARTESCA-9658_retry_for_ETCd_backup branch 5 times, most recently from 35e7399 to 2a17d53 Compare October 4, 2023 11:09
@aprucolimartins aprucolimartins force-pushed the feature/ARTESCA-9658_retry_for_ETCd_backup branch from 2a17d53 to a9e1b44 Compare October 4, 2023 11:21
@aprucolimartins
Copy link
Contributor Author

Retry works properly :
Screenshot 2023-10-04 at 14 38 51

ezekiel-alexrod
ezekiel-alexrod approved these changes Oct 4, 2023
View reviewed changes
Copy link
Contributor

@ezekiel-alexrod ezekiel-alexrod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noice !

@aprucolimartins
Copy link
Contributor Author

/create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Oct 4, 2023

History mismatch

Merge commit #dfa29e5818a50eeb3d90fa3c31f2a496d3343912 on the integration branch
w/126.0/feature/ARTESCA-9658_retry_for_ETCd_backup is merging a branch which is neither the current
branch feature/ARTESCA-9658_retry_for_ETCd_backup nor the development branch
development/126.0.

It is likely due to a rebase of the branch feature/ARTESCA-9658_retry_for_ETCd_backup 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

@aprucolimartins
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Oct 4, 2023

Reset complete

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

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Oct 4, 2023

Integration data created

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

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

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 Oct 4, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: create_integration_branches

@aprucolimartins
Copy link
Contributor Author

/approve

@scality scality deleted a comment from bert-e Oct 4, 2023
@bert-e
Copy link
Contributor

bert-e commented Oct 4, 2023

Build failed

The build for commit did not succeed in branch w/127.0/feature/ARTESCA-9658_retry_for_ETCd_backup.

The following options are set: approve, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Oct 4, 2023

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:

  • ✔️ development/125.0

  • ✔️ development/126.0

  • ✔️ development/127.0

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

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.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

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

@bert-e
Copy link
Contributor

bert-e commented Oct 4, 2023

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

  • ✔️ development/125.0

  • ✔️ development/126.0

  • ✔️ development/127.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue ARTESCA-9658.

Goodbye aprucolimartins.

@aprucolimartins aprucolimartins merged commit a9e1b44 into development/125.0 Oct 4, 2023
34 of 36 checks passed
@aprucolimartins aprucolimartins deleted the feature/ARTESCA-9658_retry_for_ETCd_backup branch October 4, 2023 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eg-ayoub eg-ayoub eg-ayoub left review comments

@ezekiel-alexrod ezekiel-alexrod ezekiel-alexrod 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.
4 participants
@aprucolimartins @bert-e @eg-ayoub @ezekiel-alexrod