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

salt: Downgrade pre-check allow saltenv >= higher node #2552

Merged
merged 1 commit into from
May 18, 2020
Merged

salt: Downgrade pre-check allow saltenv >= higher node #2552

merged 1 commit into from
May 18, 2020

Conversation

TeddyAndrieux
Copy link
Collaborator

Component:

'salt', 'lifecycle'

Summary:

Node version represent the version desired on a specific node and not
the actual deployed version so if for any reason a downgrade failed
after all node version being set to the destination one, we want to be
able to run the downgrade again so the saltenv specified may be higher
that all the node versions

Fixes: #2551

@TeddyAndrieux TeddyAndrieux requested a review from a team May 15, 2020 09:49
@bert-e
Copy link
Contributor

bert-e commented May 15, 2020

Hello teddyandrieux,

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 May 15, 2020

Integration data created

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

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3

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 May 15, 2020

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:

@TeddyAndrieux TeddyAndrieux force-pushed the bugfix/GH-2551-fix-downgrade-pre-check branch from ef22030 to 0e22422 Compare May 15, 2020 10:35
@bert-e
Copy link
Contributor

bert-e commented May 15, 2020

History mismatch

Merge commit #ef2203012afcce82ac5486f1bea0130ed3ab98da on the integration branch
w/2.1/bugfix/GH-2551-fix-downgrade-pre-check is merging a branch which is neither the current
branch bugfix/GH-2551-fix-downgrade-pre-check nor the development branch
development/2.1.

It is likely due to a rebase of the branch bugfix/GH-2551-fix-downgrade-pre-check 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.

@TeddyAndrieux
Copy link
Collaborator Author

/reset

@bert-e
Copy link
Contributor

bert-e commented May 15, 2020

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented May 15, 2020

Integration data created

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

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3

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 May 15, 2020

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:

gdemonet
gdemonet previously approved these changes May 15, 2020
View reviewed changes
@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented May 15, 2020

Build failed

The build for commit did not succeed in branch w/2.4/bugfix/GH-2551-fix-downgrade-pre-check.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 15, 2020

Build failed

The build for commit did not succeed in branch w/2.5/bugfix/GH-2551-fix-downgrade-pre-check.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 15, 2020

Build failed

The build for commit did not succeed in branch w/2.4/bugfix/GH-2551-fix-downgrade-pre-check.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 15, 2020

Build failed

The build for commit did not succeed in branch w/2.5/bugfix/GH-2551-fix-downgrade-pre-check.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 15, 2020

Build failed

The build for commit did not succeed in branch w/2.4/bugfix/GH-2551-fix-downgrade-pre-check.

The following options are set: approve

@TeddyAndrieux
salt: Downgrade pre-check allow saltenv >= higher node
41a3583 
Node version represent the version desired on a specific node and not
the actual deployed version so if for any reason a downgrade failed
after all node version being set to the destination one, we want to be
able to run the downgrade again so the saltenv specified may be higher
that all the node versions

Fixes: #2551
@TeddyAndrieux TeddyAndrieux force-pushed the bugfix/GH-2551-fix-downgrade-pre-check branch from 0e22422 to 41a3583 Compare May 18, 2020 07:25
@bert-e
Copy link
Contributor

bert-e commented May 18, 2020

History mismatch

Merge commit #0e22422ac1f1561b12fd04bebee0ccb0a644fd8f on the integration branch
w/2.1/bugfix/GH-2551-fix-downgrade-pre-check is merging a branch which is neither the current
branch bugfix/GH-2551-fix-downgrade-pre-check nor the development branch
development/2.1.

It is likely due to a rebase of the branch bugfix/GH-2551-fix-downgrade-pre-check 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
Copy link
Collaborator Author

/reset

@bert-e
Copy link
Contributor

bert-e commented May 18, 2020

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 May 18, 2020

Integration data created

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

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3

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 May 18, 2020

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

gdemonet
gdemonet approved these changes May 18, 2020
View reviewed changes
Copy link
Contributor

@gdemonet gdemonet left a comment

Choose a reason for hiding this comment

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

:shipit:

@bert-e
Copy link
Contributor

bert-e commented May 18, 2020

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/2.0

  • ✔️ development/2.1

  • ✔️ development/2.2

  • ✔️ development/2.3

  • ✔️ development/2.4

  • ✔️ development/2.5

  • ✔️ development/2.6

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3

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 May 18, 2020

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

  • ✔️ development/2.0

  • ✔️ development/2.1

  • ✔️ development/2.2

  • ✔️ development/2.3

  • ✔️ development/2.4

  • ✔️ development/2.5

  • ✔️ development/2.6

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3

Please check the status of the associated issue GH-2551.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 41a3583 into development/2.0 May 18, 2020
@bert-e bert-e deleted the bugfix/GH-2551-fix-downgrade-pre-check branch May 18, 2020 08:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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