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-10079 Force bootstrap bundle roles on ext_pillar #4196

Merged
merged 1 commit into from
Nov 14, 2023
Merged

ARTESCA-10079 Force bootstrap bundle roles on ext_pillar #4196

merged 1 commit into from
Nov 14, 2023

Conversation

aprucolimartins
Copy link
Contributor

@aprucolimartins aprucolimartins commented Nov 10, 2023 •
edited by TeddyAndrieux
Loading

Fixes: #2137

@bert-e
Copy link
Contributor

bert-e commented Nov 10, 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 Nov 10, 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 changed the base branch from development/127.0 to development/126.0 November 10, 2023 11:10
@bert-e
Copy link
Contributor

bert-e commented Nov 10, 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 bugfix/ARTESCA-10079_prevent_bootstrap_to_re_run_when_failed branch 2 times, most recently from a77ae4a to 606eb97 Compare November 10, 2023 13:27
@aprucolimartins aprucolimartins force-pushed the bugfix/ARTESCA-10079_prevent_bootstrap_to_re_run_when_failed branch 3 times, most recently from a255af5 to 8d43624 Compare November 10, 2023 18:44
@aprucolimartins aprucolimartins force-pushed the bugfix/ARTESCA-10079_prevent_bootstrap_to_re_run_when_failed branch 2 times, most recently from d504a4c to 407cd87 Compare November 13, 2023 08:53
TeddyAndrieux
TeddyAndrieux requested changes Nov 13, 2023
View reviewed changes
salt/_pillar/metalk8s_nodes.py Outdated Show resolved Hide resolved
salt/_pillar/metalk8s_nodes.py Outdated Show resolved Hide resolved
@aprucolimartins aprucolimartins force-pushed the bugfix/ARTESCA-10079_prevent_bootstrap_to_re_run_when_failed branch 2 times, most recently from cb4eb94 to f1aca18 Compare November 13, 2023 10:25
@aprucolimartins aprucolimartins marked this pull request as ready for review November 13, 2023 10:25
@aprucolimartins aprucolimartins requested a review from a team as a code owner November 13, 2023 10:25
@aprucolimartins aprucolimartins force-pushed the bugfix/ARTESCA-10079_prevent_bootstrap_to_re_run_when_failed branch 2 times, most recently from 81662d7 to 66ba160 Compare November 13, 2023 10:53
@aprucolimartins
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Nov 13, 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/125.0
  • 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: approve

@bert-e
Copy link
Contributor

bert-e commented Nov 13, 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 reviewers are expecting changes from the author, or must review again:

The following options are set: approve

@aprucolimartins aprucolimartins force-pushed the bugfix/ARTESCA-10079_prevent_bootstrap_to_re_run_when_failed branch from 66ba160 to 416c1d0 Compare November 13, 2023 11:01
@bert-e
Copy link
Contributor

bert-e commented Nov 13, 2023

History mismatch

Merge commit #66ba160abc7ca2e2af92eef45feed81fb9a94521 on the integration branch
w/127.0/bugfix/ARTESCA-10079_prevent_bootstrap_to_re_run_when_failed is merging a branch which is neither the current
branch bugfix/ARTESCA-10079_prevent_bootstrap_to_re_run_when_failed nor the development branch
development/127.0.

It is likely due to a rebase of the branch bugfix/ARTESCA-10079_prevent_bootstrap_to_re_run_when_failed 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

TeddyAndrieux
TeddyAndrieux reviewed Nov 13, 2023
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
@aprucolimartins aprucolimartins force-pushed the bugfix/ARTESCA-10079_prevent_bootstrap_to_re_run_when_failed branch from 416c1d0 to 69ad86b Compare November 13, 2023 13:03
TeddyAndrieux
TeddyAndrieux approved these changes Nov 13, 2023
View reviewed changes
Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux left a comment

Choose a reason for hiding this comment

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

LGTM, good job 👍

@aprucolimartins
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Nov 14, 2023

Reset complete

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

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Nov 14, 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/125.0
  • 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: approve

@bert-e
Copy link
Contributor

bert-e commented Nov 14, 2023

Build failed

The build for commit did not succeed in branch w/127.0/bugfix/ARTESCA-10079_prevent_bootstrap_to_re_run_when_failed.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Nov 14, 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/126.0

  • ✔️ development/127.0

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • 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

@bert-e
Copy link
Contributor

bert-e commented Nov 14, 2023

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

  • ✔️ development/126.0

  • ✔️ development/127.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • 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-10079.

Goodbye aprucolimartins.

@aprucolimartins aprucolimartins merged commit 69ad86b into development/126.0 Nov 14, 2023
45 of 50 checks passed
@aprucolimartins aprucolimartins deleted the bugfix/ARTESCA-10079_prevent_bootstrap_to_re_run_when_failed branch November 14, 2023 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TeddyAndrieux TeddyAndrieux TeddyAndrieux 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.
3 participants
@aprucolimartins @bert-e @TeddyAndrieux