Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] Revert docker/swarmkit#2804#252

Merged
andrewhsu merged 1 commit intodocker-archive:19.03from
thaJeztah:19.03_bump_swarmkit
Jun 4, 2019
Merged

[19.03 backport] Revert docker/swarmkit#2804#252
andrewhsu merged 1 commit intodocker-archive:19.03from
thaJeztah:19.03_bump_swarmkit

Conversation

@thaJeztah
Copy link
Member

backport of moby#39281 for 19.03.

Local changes applied cleanly, but the vendor.conf did not; fixed by changing vendor.conf to point to the bump_v19.03 branch (which includes moby/swarmkit#2863), and running vndr again.

- What I did

Reverts the change to swarmkit that made all updates set UpdateStatus to Completed.

See moby/swarmkit#2861

related: moby/swarmkit#2804, moby#38520

fixes moby/swarmkit#2861
fixes moby#39023

- How I did it

Returned the integration test to the way it was before

Reverts the change to swarmkit that made all updates set UpdateStatus to
Completed

Signed-off-by: Drew Erny <[email protected]>
(cherry picked from commit c7d9599)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 19.03.0 milestone Jun 3, 2019
@thaJeztah
Copy link
Member Author

ping @dperny @andrewhsu ptal

@dperny
Copy link

dperny commented Jun 3, 2019

thank you sebastiaan 🙌

@dperny
Copy link

dperny commented Jun 3, 2019

windows failure is almost certainly unrelated

@thaJeztah
Copy link
Member Author

Yes, RS1 failure is unrelated, and being looked at

@thaJeztah thaJeztah changed the title [19.03 backport] Revert docker/swarmkit#2804 [WIP][19.03 backport] Revert docker/swarmkit#2804 Jun 4, 2019
@thaJeztah
Copy link
Member Author

WIP, waiting for upstream to be merged

@thaJeztah thaJeztah changed the title [WIP][19.03 backport] Revert docker/swarmkit#2804 [19.03 backport] Revert docker/swarmkit#2804 Jun 4, 2019
Copy link

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu andrewhsu merged commit 0678d71 into docker-archive:19.03 Jun 4, 2019
@thaJeztah thaJeztah deleted the 19.03_bump_swarmkit branch June 4, 2019 17:34
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants