Azure Pipeline (envoyproxy#19)

* envoy: update to latest HEAD Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com> * CI: Update Azure Pipeline Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com> * debug Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com> * test boringssl is disabled Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com> * fix typo Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
venilnoronha · Jan 23, 2020 · f3638d1 · f3638d1
1 parent 66149d4
commit f3638d1
Show file tree

Hide file tree

Showing 5 changed files with 291 additions and 290 deletions.
diff --git a/.azure-pipelines/linux.yaml b/.azure-pipelines/linux.yaml
@@ -1,61 +1,54 @@
-resources:
-  containers:
-  - container: envoy-build-image
-    image: envoyproxy/envoy-build:latest
-
 trigger:
   branches:
     include:
     - 'master'
 
 jobs:
-# - job: build
-#   dependsOn: []
-#   pool:
-#     vmImage: 'Ubuntu 16.04'
-#   container: envoy-build-image
-#   steps:
-#     - checkout: self
-#       submodules: true
-#     - script: |
-#         bazel build //:envoy && \
-#         ./bazel-bin/envoy --version
-#       displayName: 'Build Envoy-OpenSSL'
-# - job: test
-#   dependsOn: []
-#   pool:
-#     vmImage: 'Ubuntu 16.04'
-#   container: envoy-build-image
-#   steps:
-#     - checkout: self
-#       submodules: true
-#     - script: |
-#         bazel test //test/common/... //test/extensions/...
-#       displayName: 'Test Envoy-OpenSSL'
-#  - job: test-envoy
-#    dependsOn: []
-#    pool:
-#      vmImage: 'Ubuntu 16.04'
-#    container: envoy-build-image
-#    steps:
-#      - checkout: self
-#        submodules: true
-#      - script: bazel test @envoy//test/...
-#        displayName: 'Test Envoy'
-  - job: verify
-    dependsOn: []
-    pool:
-      vmImage: 'Ubuntu 16.04'
-    container: envoy-build-image
-    steps:
-      - checkout: self
-        submodules: true
-      - script: |
-          bazel cquery "deps(//:envoy)" | grep @boringssl
-          if [[ $(bazel cquery "deps(//:envoy)" 2> /dev/null | grep @boringssl) ]]; then
-            echo "Envoy still depends on BoringSSL in boringssl=disabled mode!"
-            exit 1
-          else
-            echo "Envoy was built without BoringSSL dependencies!"
-          fi
-        displayName: 'Verify Envoy-OpenSSL'
+- job: boringssl
+  dependsOn: []
+  timeoutInMinutes: 60
+  pool:
+    vmImage: 'Ubuntu 16.04'
+  steps:
+  - checkout: self
+    submodules: true
+
+  - script: envoy/ci/run_envoy_docker.sh 'test 0 -eq $(cd /source && bazel cquery "deps($ENVOY_BUILD_TARGET)" | grep -c @boringssl)'
+    workingDirectory: $(Build.SourcesDirectory)
+    env:
+      ENVOY_BUILD_TARGET: "//:envoy"
+      ENVOY_SRCDIR: "/source/envoy"
+      BAZEL_BUILD_EXTRA_OPTIONS: "--curses=no"
+    displayName: "Test BoringSSL is disabled"
+
+- job: bazel
+  dependsOn: ["boringssl"]
+  strategy:
+    maxParallel: 2
+    matrix:
+      dev:
+        CI_TARGET: 'bazel.dev'
+      release:
+        CI_TARGET: 'bazel.release'
+  timeoutInMinutes: 360
+  pool:
+    vmImage: 'Ubuntu 16.04'
+  steps:
+  - checkout: self
+    submodules: true
+  - bash: |
+      sudo mkdir -p /etc/docker
+      echo '{
+        "ipv6": true,
+        "fixed-cidr-v6": "2001:db8:1::/64"
+      }' | sudo tee /etc/docker/daemon.json
+      sudo service docker restart
+    displayName: "Enable IPv6"
+
+  - script: envoy/ci/run_envoy_docker.sh 'envoy/ci/do_ci.sh $(CI_TARGET) //test/common/... //test/extensions/...'
+    workingDirectory: $(Build.SourcesDirectory)
+    env:
+      ENVOY_BUILD_TARGET: "//:envoy"
+      ENVOY_SRCDIR: "/source/envoy"
+      BAZEL_BUILD_EXTRA_OPTIONS: "--curses=no"
+    displayName: "Run CI script"
diff --git a/envoy b/envoy
diff --git a/source/extensions/transport_sockets/tls/config.cc b/source/extensions/transport_sockets/tls/config.cc
@@ -21,8 +21,8 @@ Network::TransportSocketFactoryPtr UpstreamSslSocketFactory::createTransportSock
           const envoy::extensions::transport_sockets::tls::v3::UpstreamTlsContext&>(
           message, context.messageValidationVisitor()),
       context);
-  return std::make_unique<ClientSslSocketFactory>(
-      std::move(client_config), context.sslContextManager(), context.statsScope());
+  return std::make_unique<ClientSslSocketFactory>(std::move(client_config),
+                                                  context.sslContextManager(), context.scope());
 }
 
 ProtobufTypes::MessagePtr UpstreamSslSocketFactory::createEmptyConfigProto() {
@@ -41,12 +41,11 @@ Network::TransportSocketFactoryPtr DownstreamSslSocketFactory::createTransportSo
           message, context.messageValidationVisitor()),
       context);
   return std::make_unique<ServerSslSocketFactory>(
-      std::move(server_config), context.sslContextManager(), context.statsScope(), server_names);
+      std::move(server_config), context.sslContextManager(), context.scope(), server_names);
 }
 
 ProtobufTypes::MessagePtr DownstreamSslSocketFactory::createEmptyConfigProto() {
-  return std::make_unique<
-      envoy::extensions::transport_sockets::tls::v3::DownstreamTlsContext>();
+  return std::make_unique<envoy::extensions::transport_sockets::tls::v3::DownstreamTlsContext>();
 }
 
 REGISTER_FACTORY(DownstreamSslSocketFactory,

diff --git a/test/mocks/server/mocks.cc b/test/mocks/server/mocks.cc
@@ -148,7 +148,9 @@ MockInstance::MockInstance()
       singleton_manager_(new Singleton::ManagerImpl(Thread::threadFactoryForTest())),
       grpc_context_(stats_store_.symbolTable()), http_context_(stats_store_.symbolTable()),
       server_factory_context_(
-          std::make_shared<NiceMock<Configuration::MockServerFactoryContext>>()) {
+          std::make_shared<NiceMock<Configuration::MockServerFactoryContext>>()),
+      transport_socket_factory_context_(
+          std::make_shared<NiceMock<Configuration::MockTransportSocketFactoryContext>>()) {
   ON_CALL(*this, threadLocal()).WillByDefault(ReturnRef(thread_local_));
   ON_CALL(*this, stats()).WillByDefault(ReturnRef(stats_store_));
   ON_CALL(*this, grpcContext()).WillByDefault(ReturnRef(grpc_context_));
@@ -174,6 +176,8 @@ MockInstance::MockInstance()
   ON_CALL(*this, overloadManager()).WillByDefault(ReturnRef(overload_manager_));
   ON_CALL(*this, messageValidationContext()).WillByDefault(ReturnRef(validation_context_));
   ON_CALL(*this, serverFactoryContext()).WillByDefault(ReturnRef(*server_factory_context_));
+  ON_CALL(*this, transportSocketFactoryContext())
+      .WillByDefault(ReturnRef(*transport_socket_factory_context_));
 }
 
 MockInstance::~MockInstance() = default;