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

[19.03 backport] Add TC to check dynamic subnet for ingress network #374

Merged
andrewhsu merged 2 commits into from
Nov 6, 2019
Merged

[19.03 backport] Add TC to check dynamic subnet for ingress network #374

andrewhsu merged 2 commits into from
Nov 6, 2019

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Sep 21, 2019 •
edited
Loading

based on top of #281 and #376

depends on:

closes #375 (which is an alternative for this one)

Revert #375

brings back #369

full diff: moby/swarmkit@bbe3418...f35d910

changes included:

Backport of moby#39966 for 19.03

To fix CI being red after merging #369 (effectively a backport of moby#39953)

Marked as "WIP", because upstream isn't merged yet

@thaJeztah thaJeztah added this to the 19.03.3 milestone Sep 21, 2019
@thaJeztah thaJeztah changed the title [WIP][19.03 backport] Add TC to check dyanmic subnet for ingress network [WIP][19.03 backport] Add TC to check dynamic subnet for ingress network Sep 21, 2019
This was referenced Sep 21, 2019
Merged
Merged
@thaJeztah
Copy link
Member Author

thaJeztah commented Sep 21, 2019

Failing because moby#39671 has not yet been back ported

[2019-09-21T08:55:08.426Z] # github.com/docker/docker/integration/network [github.com/docker/docker/integration/network.test]
[2019-09-21T08:55:08.426Z] integration/network/service_test.go:428:32: undefined: ctx
script returned exit code 2[2019-09-21T08:55:09.462Z] + echo Ensuring container killed.

@thaJeztah
Copy link
Member Author

thaJeztah commented Sep 21, 2019 •
edited
Loading

And moby#39671 depends on #281 and moby#37836 😂 🎉

@thaJeztah thaJeztah force-pushed the 19.03_backport_add_tc_dynamic_ingress_network branch from eda677e to ec4a935 Compare September 21, 2019 09:49
This was referenced Sep 21, 2019
Merged
Merged
@thaJeztah
Copy link
Member Author

thaJeztah commented Sep 21, 2019

This one is green, but the ones this depends on no longer are green (because this PR fixes CI)

I guess once the upstream PR is fixed, we should just merge all of these

@thaJeztah
Copy link
Member Author

thaJeztah commented Sep 21, 2019

@kolyshkin @arkodg @tiborvass PTAL

arkodg
arkodg approved these changes Sep 21, 2019
View reviewed changes
Copy link

@arkodg arkodg left a comment

Choose a reason for hiding this comment

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

LGTM , thanks !

@thaJeztah thaJeztah force-pushed the 19.03_backport_add_tc_dynamic_ingress_network branch 2 times, most recently from 5552b06 to f788ef5 Compare September 23, 2019 17:16
@thaJeztah thaJeztah force-pushed the 19.03_backport_add_tc_dynamic_ingress_network branch from f788ef5 to e50a022 Compare October 2, 2019 21:21
@thaJeztah thaJeztah modified the milestones: 19.03.3, 19.03.4 Oct 8, 2019
@thaJeztah thaJeztah mentioned this pull request Oct 10, 2019
Closed
@thaJeztah thaJeztah modified the milestones: 19.03.4, 19.03.5 Oct 11, 2019
thaJeztah and others added 2 commits October 31, 2019 17:46
@thaJeztah
Revert "Revert "[19.03] bump swarmkit to f35d9100f2c6ac810cc8d7de6e8f…
0c38d56 
…93dcc7a42d29""

This reverts commit ef4366e.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Add TC to check dyanmic subnet for ingress network
12e7d99 
Signed-off-by: Arko Dasgupta <[email protected]>
(cherry picked from commit e2b5ac75a393f6942c37efdd888fc3bc761de244)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 19.03_backport_add_tc_dynamic_ingress_network branch from e50a022 to 12e7d99 Compare October 31, 2019 16:47
@andrewhsu andrewhsu changed the title [WIP][19.03 backport] Add TC to check dynamic subnet for ingress network [19.03 backport] Add TC to check dynamic subnet for ingress network Nov 6, 2019
@andrewhsu
Copy link

andrewhsu commented Nov 6, 2019

known flaky failure

--- FAIL: TestDockerSwarmSuite/TestSwarmClusterRotateUnlockKey (61.38s)

@andrewhsu andrewhsu merged commit 075a020 into docker-archive:19.03 Nov 6, 2019
@thaJeztah thaJeztah deleted the 19.03_backport_add_tc_dynamic_ingress_network branch November 6, 2019 05:05
@thaJeztah thaJeztah mentioned this pull request Feb 18, 2020
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@arkodg arkodg arkodg approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

19.03.5

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah @andrewhsu @arkodg