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.

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

Upgrade Salt to 3000.3 #2549

Merged
merged 1 commit into from
May 15, 2020
Merged

Upgrade Salt to 3000.3 #2549

merged 1 commit into from
May 15, 2020

Conversation

TeddyAndrieux
Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux commented May 14, 2020

Component:

'salt', 'build'

Summary:

Change salt-master image to salt 3000.3 and download salt-minion version
3000.3

https://docs.saltstack.com/en/latest/topics/releases/3000.3.html

Change salt-master image to salt 3000.3 and download salt-minion version
3000.3
@TeddyAndrieux TeddyAndrieux added kind:enhancement New feature or request topic:deployment Bugs in or enhancements to deployment stages topic:build Anything related to building steps complexity:easy Something that requires less than a day to fix labels May 14, 2020
@TeddyAndrieux TeddyAndrieux requested a review from a team May 14, 2020 09:58
@bert-e
Copy link
Contributor

bert-e commented May 14, 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 14, 2020

Conflict

A conflict has been raised during the creation of
integration branch w/2.1/bugfix/salt-upgrade-3000-3 with contents from bugfix/salt-upgrade-3000-3
and development/2.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.1/bugfix/salt-upgrade-3000-3 origin/development/2.1
 $ git merge origin/bugfix/salt-upgrade-3000-3
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.1/bugfix/salt-upgrade-3000-3

@TeddyAndrieux TeddyAndrieux added this to Review in progress in Week 20/2020 May 14, 2020
@bert-e
Copy link
Contributor

bert-e commented May 14, 2020

Conflict

A conflict has been raised during the creation of
integration branch w/2.4/bugfix/salt-upgrade-3000-3 with contents from w/2.3/bugfix/salt-upgrade-3000-3
and development/2.4.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.4/bugfix/salt-upgrade-3000-3 origin/development/2.4
 $ git merge origin/w/2.3/bugfix/salt-upgrade-3000-3
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.4/bugfix/salt-upgrade-3000-3

@bert-e
Copy link
Contributor

bert-e commented May 14, 2020

Conflict

A conflict has been raised during the creation of
integration branch w/2.5/bugfix/salt-upgrade-3000-3 with contents from w/2.4/bugfix/salt-upgrade-3000-3
and development/2.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.5/bugfix/salt-upgrade-3000-3 origin/development/2.5
 $ git merge origin/w/2.4/bugfix/salt-upgrade-3000-3
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.5/bugfix/salt-upgrade-3000-3

@bert-e
Copy link
Contributor

bert-e commented May 14, 2020

Conflict

A conflict has been raised during the creation of
integration branch w/2.6/bugfix/salt-upgrade-3000-3 with contents from w/2.5/bugfix/salt-upgrade-3000-3
and development/2.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.6/bugfix/salt-upgrade-3000-3 origin/development/2.6
 $ git merge origin/w/2.5/bugfix/salt-upgrade-3000-3
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.6/bugfix/salt-upgrade-3000-3

@NicolasT
Copy link
Contributor

What would change for us?

@bert-e
Copy link
Contributor

bert-e commented May 14, 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
Copy link
Collaborator Author

TeddyAndrieux commented May 14, 2020

What would change for us?

Fixed some bugs in Salt but nothing for us because we are not using the "things" that have been fixed. But anyway always good to have the last patch release

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented May 14, 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

Week 20/2020 automation moved this from Review in progress to Reviewer approved May 14, 2020
@bert-e
Copy link
Contributor

bert-e commented May 14, 2020

Build failed

The build for commit did not succeed in branch w/2.5/bugfix/salt-upgrade-3000-3.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 14, 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 15, 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 None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit afb5419 into development/2.0 May 15, 2020
Week 20/2020 automation moved this from Reviewer approved to Done May 15, 2020
@bert-e bert-e deleted the bugfix/salt-upgrade-3000-3 branch May 15, 2020 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
complexity:easy Something that requires less than a day to fix kind:enhancement New feature or request topic:build Anything related to building steps topic:deployment Bugs in or enhancements to deployment stages
Projects
No open projects
Week 20/2020
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants