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

[17.12] update vndr of swarmkit to a7680ec #432

Closed
wants to merge 2 commits into from
Closed

[17.12] update vndr of swarmkit to a7680ec #432

wants to merge 2 commits into from

Conversation

andrewhsu
Copy link
Contributor

brings in this change:

comparison of changes on the engine: moby/swarmkit@7598f7a...a7680ec

comparison of changes on the cli: moby/swarmkit@de950a7...a7680ec

@andrewhsu
update engine vndr of swarmkit to a7680ec
3b079f3 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu
update cli vndr of swarmkit to a7680ec
a3136ad 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu andrewhsu added this to the 17.12.1 milestone Feb 20, 2018
@dperny
Copy link
Contributor

dperny commented Feb 20, 2018

the changes to protobuf are just a weird import path changing thing. not sure how they got introduced, but they're part of a higher-level repository so vendoring that package isn't a concern, and if this builds fine then it works.

thaJeztah
thaJeztah approved these changes Feb 21, 2018
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah
Copy link
Member

Not sure what went wrong in the s390x CI;

01:56:34 ----------------------------------------------------------------------
01:56:34 FAIL: docker_cli_swarm_test.go:1539: DockerSwarmSuite.TestSwarmNetworkIPAMOptions
01:56:34 
01:56:34 [d8ccc6685ba4c] waiting for daemon to start
01:56:34 [d8ccc6685ba4c] daemon started
01:56:34 
01:56:34 docker_cli_swarm_test.go:1549:
01:56:34     c.Assert(strings.TrimSpace(out), checker.Contains, "com.docker.network.ipam.serial:true")
01:56:34 ... obtained string = "map[foo:bar]"
01:56:34 ... substring string = "com.docker.network.ipam.serial:true"
01:56:34 
01:56:34 [d8ccc6685ba4c] exiting daemon

@anshulpundir
Copy link
Contributor

Also include moby/swarmkit#2519 in this ? @andrewhsu

@sebbrandt87
Copy link

sebbrandt87 commented Feb 27, 2018 •
edited
Loading

What about the failing ce-tests-s390x?

@andrewhsu andrewhsu removed this from the 17.12.1 milestone Mar 23, 2018
@andrewhsu andrewhsu closed this May 14, 2018
@andrewhsu andrewhsu deleted the sk branch August 23, 2018 06:03
docker-jenkins pushed a commit that referenced this pull request Feb 19, 2020
@silvin-lubecki
Merge pull request #432 from thaJeztah/19.03_backport_bump_golang_1.1…
d97f4c3 
…2.17

[19.03 backport] Update Golang 1.12.17
Upstream-commit: 3a8cae1ae473097ace7150734d368acaab083c52
Component: packaging
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@marcusmartins marcusmartins Awaiting requested review from marcusmartins

@nishanttotla nishanttotla Awaiting requested review from nishanttotla

@anshulpundir anshulpundir Awaiting requested review from anshulpundir

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@andrewhsu @dperny @thaJeztah @anshulpundir @sebbrandt87