diff options
Diffstat (limited to 'tools')
12 files changed, 144 insertions, 28 deletions
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux_x64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux_x64/Dockerfile index 6f61e17b4a..07604c7c42 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux_x64/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_manylinux_x64/Dockerfile @@ -18,19 +18,7 @@ FROM quay.io/pypa/manylinux1_x86_64 # Update the package manager RUN yum update -y - -############################################################# -# Update Git to allow cloning submodules with --reference arg -RUN yum remove -y git RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-devel zlib-devel gcc -RUN cd /usr/src && \ - curl -O -L https://kernel.org/pub/software/scm/git/git-2.0.5.tar.gz && \ - tar xzf git-2.0.5.tar.gz -RUN cd /usr/src/git-2.0.5 && \ - make prefix=/usr/local/git all && \ - make prefix=/usr/local/git install -ENV PATH /usr/local/git/bin:$PATH -RUN source /etc/bashrc ################################### # Install Python build requirements diff --git a/tools/dockerfile/grpc_artifact_python_manylinux_x86/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux_x86/Dockerfile index 5c3c35188f..96ab515efe 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux_x86/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_manylinux_x86/Dockerfile @@ -18,19 +18,7 @@ FROM quay.io/pypa/manylinux1_i686 # Update the package manager RUN yum update -y - -############################################################# -# Update Git to allow cloning submodules with --reference arg -RUN yum remove -y git RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-devel zlib-devel gcc -RUN cd /usr/src && \ - curl -O -L https://kernel.org/pub/software/scm/git/git-2.0.5.tar.gz && \ - tar xzf git-2.0.5.tar.gz -RUN cd /usr/src/git-2.0.5 && \ - make prefix=/usr/local/git all && \ - make prefix=/usr/local/git install -ENV PATH /usr/local/git/bin:$PATH -RUN source /etc/bashrc ################################### # Install Python build requirements diff --git a/tools/dockerfile/interoptest/grpc_interop_dart/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_dart/Dockerfile new file mode 100644 index 0000000000..d7549960d3 --- /dev/null +++ b/tools/dockerfile/interoptest/grpc_interop_dart/Dockerfile @@ -0,0 +1,18 @@ +# Copyright 2017 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM google/dart:latest + +# Define the default command. +CMD ["bash"] diff --git a/tools/dockerfile/interoptest/grpc_interop_dart/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_dart/build_interop.sh new file mode 100644 index 0000000000..c4cb6829d3 --- /dev/null +++ b/tools/dockerfile/interoptest/grpc_interop_dart/build_interop.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# Copyright 2017 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Builds Dart interop server and client in a base image. +set -e + +mkdir -p /var/local/git +git clone /var/local/jenkins/grpc-dart /var/local/git/grpc-dart + +# copy service account keys if available +cp -r /var/local/jenkins/service_account $HOME || true + +cd /var/local/git/grpc-dart/interop +/usr/lib/dart/bin/pub get diff --git a/tools/internal_ci/helper_scripts/prepare_build_interop_rc b/tools/internal_ci/helper_scripts/prepare_build_interop_rc index db978c8b3f..fb0f4b8054 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_interop_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_interop_rc @@ -27,6 +27,7 @@ git submodule update --init git clone --recursive https://github.com/grpc/grpc-go ./../grpc-go git clone --recursive https://github.com/grpc/grpc-java ./../grpc-java git clone --recursive https://github.com/grpc/grpc-node ./../grpc-node +git clone --recursive https://github.com/grpc/grpc-dart ./../grpc-dart # Download json file. mkdir ~/service_account diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_interop_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_interop_rc index 6ecf51dd3f..786cd4559e 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_interop_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_interop_rc @@ -32,6 +32,7 @@ brew install md5sha1sum git clone --recursive https://github.com/grpc/grpc-go ./../grpc-go git clone --recursive https://github.com/grpc/grpc-java ./../grpc-java git clone --recursive https://github.com/grpc/grpc-node ./../grpc-node +git clone --recursive https://github.com/grpc/grpc-dart ./../grpc-dart # Set up Docker for Mac docker-machine create -d virtualbox --virtualbox-share-folder "/Users/kbuilder/workspace:" default diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py index 906f690d98..83d75ec0eb 100644 --- a/tools/interop_matrix/client_matrix.py +++ b/tools/interop_matrix/client_matrix.py @@ -18,6 +18,7 @@ def get_github_repo(lang): return { + 'dart': 'https://github.com/grpc/grpc-dart.git', 'go': 'https://github.com/grpc/grpc-go.git', 'java': 'https://github.com/grpc/grpc-java.git', 'node': 'https://github.com/grpc/grpc-node.git', diff --git a/tools/run_tests/dockerize/build_interop_image.sh b/tools/run_tests/dockerize/build_interop_image.sh index 90605d9463..2bef4a3310 100755 --- a/tools/run_tests/dockerize/build_interop_image.sh +++ b/tools/run_tests/dockerize/build_interop_image.sh @@ -48,6 +48,14 @@ else echo "WARNING: grpc-go not found, it won't be mounted to the docker container." fi +echo "GRPC_DART_ROOT: ${GRPC_DART_ROOT:=$(cd ../grpc-dart && pwd)}" +if [ -n "$GRPC_DART_ROOT" ] +then + MOUNT_ARGS+=" -v $GRPC_DART_ROOT:/var/local/jenkins/grpc-dart:ro" +else + echo "WARNING: grpc-dart not found, it won't be mounted to the docker container." +fi + echo "GRPC_NODE_ROOT: ${GRPC_NODE_ROOT:=$(cd ../grpc-node && pwd)}" if [ -n "$GRPC_NODE_ROOT" ] then diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index 6b8b26f41b..abccbd4466 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -4503,6 +4503,20 @@ { "deps": [ "boringssl", + "boringssl_buf_test_lib", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_buf_test", + "src": [], + "third_party": true, + "type": "target" + }, + { + "deps": [ + "boringssl", "boringssl_bytestring_test_lib", "boringssl_test_util" ], @@ -7141,7 +7155,6 @@ "third_party/boringssl/crypto/cipher_extra/internal.h", "third_party/boringssl/crypto/conf/conf_def.h", "third_party/boringssl/crypto/conf/internal.h", - "third_party/boringssl/crypto/curve25519/internal.h", "third_party/boringssl/crypto/err/internal.h", "third_party/boringssl/crypto/evp/internal.h", "third_party/boringssl/crypto/fipsmodule/aes/aes.c", @@ -7302,7 +7315,8 @@ "third_party/boringssl/include/openssl/x509.h", "third_party/boringssl/include/openssl/x509_vfy.h", "third_party/boringssl/include/openssl/x509v3.h", - "third_party/boringssl/ssl/internal.h" + "third_party/boringssl/ssl/internal.h", + "third_party/boringssl/third_party/fiat/internal.h" ], "is_filegroup": false, "language": "c", @@ -7385,6 +7399,19 @@ "headers": [], "is_filegroup": false, "language": "c++", + "name": "boringssl_buf_test_lib", + "src": [], + "third_party": true, + "type": "lib" + }, + { + "deps": [ + "boringssl", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", "name": "boringssl_bytestring_test_lib", "src": [], "third_party": true, diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 6ce7ec28c4..d35f396994 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -5198,6 +5198,32 @@ "flaky": false, "gtest": true, "language": "c++", + "name": "boringssl_buf_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ] + }, + { + "args": [], + "boringssl": true, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "defaults": "boringssl", + "exclude_configs": [ + "asan", + "ubsan" + ], + "flaky": false, + "gtest": true, + "language": "c++", "name": "boringssl_bytestring_test", "platforms": [ "linux", diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 44a6ec26e8..4a9c282d23 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -167,6 +167,36 @@ class CSharpCoreCLRLanguage: return 'csharpcoreclr' +class DartLanguage: + + def __init__(self): + self.client_cwd = '../grpc-dart/interop' + self.server_cwd = '../grpc-dart/interop' + self.http2_cwd = '../grpc-dart/interop' + self.safename = str(self) + + def client_cmd(self, args): + return ['dart', 'bin/client.dart'] + args + + def cloud_to_prod_env(self): + return {} + + def server_cmd(self, args): + return ['dart', 'bin/server.dart'] + args + + def global_env(self): + return {} + + def unimplemented_test_cases(self): + return _SKIP_COMPRESSION + + def unimplemented_test_cases_server(self): + return _SKIP_COMPRESSION + + def __str__(self): + return 'dart' + + class JavaLanguage: def __init__(self): @@ -524,6 +554,7 @@ _LANGUAGES = { 'c++': CXXLanguage(), 'csharp': CSharpLanguage(), 'csharpcoreclr': CSharpCoreCLRLanguage(), + 'dart': DartLanguage(), 'go': GoLanguage(), 'java': JavaLanguage(), 'javaokhttp': JavaOkHttpClient(), @@ -537,7 +568,8 @@ _LANGUAGES = { # languages supported as cloud_to_cloud servers _SERVERS = [ - 'c++', 'node', 'csharp', 'csharpcoreclr', 'java', 'go', 'ruby', 'python' + 'c++', 'node', 'csharp', 'csharpcoreclr', 'java', 'go', 'ruby', 'python', + 'dart' ] _TEST_CASES = [ diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index bbe32f499d..b22bbd60e1 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -27,7 +27,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX) git submodule | awk '{ print $1 }' | sort > "$submodules" cat << EOF | awk '{ print $1 }' | sort > "$want_submodules" 5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8 third_party/benchmark (v1.2.0) - 4d7ba4e4e57195fcebdabe01489534b446ad02cb third_party/boringssl (heads/chromium-stable) + a20bb7ff8bb5057065a2e7941249773f9676cf45 third_party/boringssl (heads/chromium-stable) 886e7d75368e3f4fab3f4d0d3584e4abfc557755 third_party/boringssl-with-bazel (version_for_cocoapods_7.0-857-g886e7d7) 30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e third_party/gflags (v2.2.0) ec44c6c1675c25b9827aacd08c02433cccde7780 third_party/googletest (release-1.8.0) |