Skip to content

1.13: backport ci fixes #13958

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 12 commits into from
Nov 13, 2020
Merged

1.13: backport ci fixes #13958

merged 12 commits into from
Nov 13, 2020

Conversation

lizan
Copy link
Member

@lizan lizan commented Nov 10, 2020 •
edited
Loading 

748b2ab (mac ci: try ignoring update failure (#13658), 2020-10-20)
f95f539 (ci: various improvements (#13660), 2020-10-20)
73d78f8 (ci: use multiple stage (#13557), 2020-10-15)
b7a4756 (ci: use azp for api and go-control-plane sync (#13550), 2020-10-14)
876a6bb (ci use azp to sync filter example (#13501), 2020-10-12)
a0f31ee (ci: use azp to generate docs (#13481), 2020-10-12)
a103da9ed8 (test: fixing an integration test flake (#11845), 2020-07-01)

Signed-off-by: Lizan Zhou lizan@tetrate.io

lizan added 3 commits November 10, 2020 02:16
@lizan
1.13: backport ci fixes
9150837 
Signed-off-by: Lizan Zhou <lizan@tetrate.io>
@lizan
fix macos
ebaa5a5 
Signed-off-by: Lizan Zhou <lizan@tetrate.io>
@lizan
fix
bb19b32 
Signed-off-by: Lizan Zhou <lizan@tetrate.io>
@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Nov 10, 2020
@repokitteh-read-only
Copy link

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).

🐱

Caused by: #13958 was synchronize by lizan.

see: more, trace.

lizan and others added 5 commits November 10, 2020 02:38
@lizan
fix macos
5c3d51b 
Signed-off-by: Lizan Zhou <lizan@tetrate.io>
@lizan
fix macos
3f9157d 
Signed-off-by: Lizan Zhou <lizan@tetrate.io>
@lizan
fix macos
cac0706 
Signed-off-by: Lizan Zhou <lizan@tetrate.io>
@lizan
fix
8f3b35c 
Signed-off-by: Lizan Zhou <lizan@tetrate.io>
@alyssawilk @lizan
test: fixing a race in cx_limit_integration_test (envoyproxy#12233)
8152cd2 
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
@antoniovicente antoniovicente self-assigned this Nov 11, 2020
antoniovicente
antoniovicente reviewed Nov 12, 2020
View reviewed changes
test/integration/cx_limit_integration_test.cc Outdated
if (Network::AcceptedSocketImpl::acceptedSocketCount() == expected_connections) {
return AssertionSuccess();
}
timeSystem().advanceTimeWait(std::chrono::milliseconds(500));
Copy link
Contributor

Choose a reason for hiding this comment

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

CI shows a build failure because advanceTimeWait does not exist. Seems that before PR 10551 you need something like:
timeSystem().sleep(std::chrono::milliseconds(500));

lizan and others added 4 commits November 11, 2020 16:29
@lizan
fix build
4e175dc 
Signed-off-by: Lizan Zhou <lizan@tetrate.io>
@alyssawilk @lizan
test: fixing an integration test flake (envoyproxy#11845)
5f7fd4c 
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
@lizan
Revert "fix build"
ec570af 
This reverts commit 4e175dc.
@lizan
Revert "test: fixing a race in cx_limit_integration_test (envoyproxy#…
b4fccc9 
…12233)"

This reverts commit 8152cd2.
@lizan lizan merged commit 14863ad into envoyproxy:release/v1.13 Nov 13, 2020
@lizan lizan deleted the 1.13_ci_backport branch November 13, 2020 00:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alyssawilk alyssawilk Awaiting requested review from alyssawilk

@mattklein123 mattklein123 Awaiting requested review from mattklein123 mattklein123 is a code owner

1 more reviewer

@antoniovicente antoniovicente antoniovicente approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@antoniovicente antoniovicente

Labels
deps Approval required for changes to Envoy's external dependencies
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lizan @antoniovicente @alyssawilk