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

Modifying integration test due to new ipam options in swarmkit #35103

Merged
merged 2 commits into from Oct 10, 2017

Conversation

Projects
None yet
4 participants
@abhi
Contributor

abhi commented Oct 6, 2017

- What I did
Modified integration test to support checking for newly added ipam options. Vendored libnetwork and swarmkit.
- How I did it
Added check in integration-cli/docker_cli_swarm_test.go
- How to verify it
Run integration test

Modifying swarm integration test
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Oct 9, 2017

Member

@abhi @fcrisciani looks like this bump does not have the latest commits that #35143 had (docker/libnetwork@0f08d31...930c292)

Member

thaJeztah commented Oct 9, 2017

@abhi @fcrisciani looks like this bump does not have the latest commits that #35143 had (docker/libnetwork@0f08d31...930c292)

@thaJeztah

two small nits, but otherwise look local changes look good

Show outdated Hide outdated integration-cli/docker_cli_swarm_test.go Outdated
Show outdated Hide outdated integration-cli/docker_cli_swarm_test.go Outdated
Vendoring libnetwork and swarmkit
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
@abhi

This comment has been minimized.

Show comment
Hide comment
@abhi

abhi Oct 9, 2017

Contributor

@thaJeztah updated :)

Contributor

abhi commented Oct 9, 2017

@thaJeztah updated :)

@yongtang

LGTM if Jenkins is green

@thaJeztah

LGTM

@yongtang yongtang merged commit 9b8203c into moby:master Oct 10, 2017

7 checks passed

dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 37301 has succeeded
Details
janky Jenkins build Docker-PRs 45983 has succeeded
Details
powerpc Jenkins build Docker-PRs-powerpc 6368 has succeeded
Details
vendor Jenkins build Docker-PRs-vendor 3851 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 17553 has succeeded
Details
z Jenkins build Docker-PRs-s390x 6170 has succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment