This repository has been archived by the owner on Oct 13, 2023. It is now read-only.
[19.03 backport] integration-cli: fix swarm tests flakiness #345
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@tonistiigi @dperny PTAL @dperny perhaps you can have a look at backporting the changes in swarmkit for 19.03, so that we can update the vendor in a follow up? I updated the PR description of moby#39531 (comment) to show what changes were in that bump; probably only the last two of that are really related to this, but the gometalinter and flaky test changes look like they won't hurt to have in the "bump" branches |
thaJeztah
force-pushed
the
19.03_backport_swarm_flaky
branch
from
9d6c8c3
to
4961b0a
Compare
|
opened moby/swarmkit#2889 to backport those fixes in swarmkit |
|
Janky failed on a flaky https://ci.docker.com/public/blue/rest/organizations/jenkins/pipelines/engine/branches/PR-345/runs/3/nodes/149/log/?start=0 tracked through moby#39426 |
|
opened #350 for that remaining flaky test |
tiborvass
approved these changes
Sep 9, 2019
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Sep 12, 2019
…3 branch) full diff: moby/swarmkit@4fb9e96...bbe3418 changes included: - moby/swarmkit#2889 [19.03 backport] Fix update out of sequence and increase max recv gRPC message size for nodes and secrets Which relates to - moby#39531 integration-cli: fix swarm tests flakiness - docker-archive#345 [19.03 backport] integration-cli: fix swarm tests flakiness And includes backports of - moby/swarmkit#2808 Fix flaky tests - moby/swarmkit#2866 Swap gometalinter for golangci-lint - moby/swarmkit#2869 Increase max recv gRPC message size to initialize connection broker - related / similar to moby#38103 / docker-archive#102 cluster: set bigger grpc limit for array requests - related / similar to moby#39306 Increase max recv gRPC message size for nodes and secrets - fixes moby/swarmkit#2733 Error generated when messages size is too big - moby/swarmkit#2870 Fix update out of sequence Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
19.03_backport_swarm_flaky
branch
from
4961b0a
to
1694454
Compare
|
opened #353 for the swarmkit bump, and rebased this PR on top of that |
|
this is all green, but I'll rebase to get rid of the commit from #353 |
thaJeztah
force-pushed
the
19.03_backport_swarm_flaky
branch
from
1694454
to
1011e37
Compare
|
rebased |
docker-jenkins
pushed a commit
to docker-archive/docker-ce
that referenced
this pull request
Sep 12, 2019
…3 branch) full diff: moby/swarmkit@4fb9e96...bbe3418 changes included: - moby/swarmkit#2889 [19.03 backport] Fix update out of sequence and increase max recv gRPC message size for nodes and secrets Which relates to - moby/moby#39531 integration-cli: fix swarm tests flakiness - docker-archive/engine#345 [19.03 backport] integration-cli: fix swarm tests flakiness And includes backports of - moby/swarmkit#2808 Fix flaky tests - moby/swarmkit#2866 Swap gometalinter for golangci-lint - moby/swarmkit#2869 Increase max recv gRPC message size to initialize connection broker - related / similar to moby/moby#38103 / docker-archive/engine#102 cluster: set bigger grpc limit for array requests - related / similar to moby/moby#39306 Increase max recv gRPC message size for nodes and secrets - fixes moby/swarmkit#2733 Error generated when messages size is too big - moby/swarmkit#2870 Fix update out of sequence Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: f7dbee3eeaa1dd218116f85b8f60361acbd5b214 Component: engine
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit 3df1095) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit 52e0dfe) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
TestSwarmClusterRotateUnlockKey had been identified as a flaky test. It turns out that the test code was wrong: where we should have been checking the string output of a command, we were instead checking the value of the error. This means that the error case we were expecting was not being matched, and the test was failing when it should have just retried. Signed-off-by: Drew Erny <drew.erny@docker.com> (cherry picked from commit b79adac) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
19.03_backport_swarm_flaky
branch
from
1011e37
to
c93da8d
Compare
|
all green now; I'm bringing this one in |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
based on top of / depends on #353rebased