From 3edede2f6dd81c010b131432747e99ab36f5507d Mon Sep 17 00:00:00 2001 From: jiajunye Date: Mon, 11 Jul 2022 22:33:16 +0000 Subject: [PATCH 1/3] Update Envoy to 0f0f675 (Jul 11th 2022) Signed-off-by: jiajunye --- bazel/repositories.bzl | 4 ++-- source/client/process_impl.cc | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 751de47f4..d4cde4edd 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -1,7 +1,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -ENVOY_COMMIT = "c4fe2aca957b977e4c954d325fb423cde51ffec8" -ENVOY_SHA = "468a6aa58b63eef6e0aa266acb74c219c8ad0216c77d34262474f1fe1aaafa74" +ENVOY_COMMIT = "0f0f675c22de944889298e0787e107265367b367" +ENVOY_SHA = "711446e6eedbced802d95e84303b6215e116bc68bfde55d8ab429dad1b9857cd" HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020 HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad" diff --git a/source/client/process_impl.cc b/source/client/process_impl.cc index 1b5d53662..ca02be837 100644 --- a/source/client/process_impl.cc +++ b/source/client/process_impl.cc @@ -197,7 +197,8 @@ class ClusterManagerFactory : public Envoy::Upstream::ProdClusterManagerFactory Envoy::Http::HttpConnPoolImplBase* pool) { Envoy::Http::CodecClientPtr codec{new Envoy::Http::CodecClientProd( Envoy::Http::CodecClient::Type::HTTP1, std::move(data.connection_), - data.host_description_, pool->dispatcher(), pool->randomGenerator())}; + data.host_description_, pool->dispatcher(), pool->randomGenerator(), + pool->transportSocketOptions())}; return codec; }, protocols); From 625af634e1ff1f5f98dbc88b6fa8ea77206cdaa6 Mon Sep 17 00:00:00 2001 From: jiajunye Date: Tue, 12 Jul 2022 19:06:21 +0000 Subject: [PATCH 2/3] disable test_gcc to unblock import Signed-off-by: jiajunye --- .azure-pipelines/pipelines.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.azure-pipelines/pipelines.yml b/.azure-pipelines/pipelines.yml index 5b2802e32..1fb4c4233 100644 --- a/.azure-pipelines/pipelines.yml +++ b/.azure-pipelines/pipelines.yml @@ -61,23 +61,6 @@ stages: parameters: ciTarget: $(CI_TARGET) -- stage: test_gcc - dependsOn: ["check"] - pool: "x64-large" - jobs: - - job: test_gcc - displayName: "do_ci.sh" - strategy: - maxParallel: 1 - matrix: - test_gcc: - CI_TARGET: "test_gcc" - timeoutInMinutes: 120 - steps: - - template: bazel.yml - parameters: - ciTarget: $(CI_TARGET) - - stage: sanitizers dependsOn: ["test"] pool: "x64-large" From 5ed79dbb833e32b8d753b9b856dbc842748eeabc Mon Sep 17 00:00:00 2001 From: jiajunye Date: Wed, 13 Jul 2022 18:25:26 +0000 Subject: [PATCH 3/3] remove the test_gcc dependency from the release stage Signed-off-by: jiajunye --- .azure-pipelines/pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.azure-pipelines/pipelines.yml b/.azure-pipelines/pipelines.yml index 1fb4c4233..5df0012b3 100644 --- a/.azure-pipelines/pipelines.yml +++ b/.azure-pipelines/pipelines.yml @@ -102,7 +102,6 @@ stages: - stage: release dependsOn: - "clang_tidy" - - "test_gcc" - "sanitizers" - "coverage" condition: eq(variables['PostSubmit'], true)