diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/buildgen/build-cleaner.py | 4 | ||||
| -rwxr-xr-x | tools/dockerfile/grpc_cxx/build.sh | 14 | ||||
| -rwxr-xr-x | tools/dockerfile/grpc_java/build.sh | 9 | ||||
| -rwxr-xr-x | tools/gce_setup/private_build_and_test.sh | 61 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 2 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 62 |
6 files changed, 111 insertions, 41 deletions
diff --git a/tools/buildgen/build-cleaner.py b/tools/buildgen/build-cleaner.py index 6c5355bce3..fba103723c 100755 --- a/tools/buildgen/build-cleaner.py +++ b/tools/buildgen/build-cleaner.py @@ -52,11 +52,15 @@ _ELEM_KEYS = [ def rebuild_as_ordered_dict(indict, special_keys): outdict = collections.OrderedDict() + for key in sorted(indict.keys()): + if '#' in key: + outdict[key] = indict[key] for key in special_keys: if key in indict: outdict[key] = indict[key] for key in sorted(indict.keys()): if key in special_keys: continue + if '#' in key: continue outdict[key] = indict[key] return outdict diff --git a/tools/dockerfile/grpc_cxx/build.sh b/tools/dockerfile/grpc_cxx/build.sh new file mode 100755 index 0000000000..8a9e95ccb8 --- /dev/null +++ b/tools/dockerfile/grpc_cxx/build.sh @@ -0,0 +1,14 @@ +#!/bin/bash +rm -rf /var/local/git +cp -R /var/local/git-clone /var/local/git + +cd /var/local/git/grpc/third_party/protobuf && \ + ./autogen.sh && \ + ./configure --prefix=/usr && \ + make -j12 && make check && make install && make clean + +cd /var/local/git/grpc && ls \ + && make clean \ + && make gens/test/cpp/util/messages.pb.cc \ + && make interop_client \ + && make interop_server diff --git a/tools/dockerfile/grpc_java/build.sh b/tools/dockerfile/grpc_java/build.sh new file mode 100755 index 0000000000..04212ceec2 --- /dev/null +++ b/tools/dockerfile/grpc_java/build.sh @@ -0,0 +1,9 @@ +#!/bin/bash +rm -rf /var/local/git +cp -R /var/local/git-clone /var/local/git +cd /var/local/git/grpc-java/lib/netty && \ + mvn -pl codec-http2 -am -DskipTests install clean +cd /var/local/git/grpc-java && \ + ./gradlew build + +echo 'build finished' diff --git a/tools/gce_setup/private_build_and_test.sh b/tools/gce_setup/private_build_and_test.sh new file mode 100755 index 0000000000..9c5c347a30 --- /dev/null +++ b/tools/gce_setup/private_build_and_test.sh @@ -0,0 +1,61 @@ +#!/bin/bash + +# This script has to be run from the same directory as grpc_docker.sh and after grpc_docker.sh is sourced +# +# Sample Usage: +# =============================== +# ./private_build_and_test.sh [language] [environment: interop|cloud] [test case] +# [git base directory] [server name in interop environment] +# sh private_build_and_test.sh java interop large_unary /usr/local/google/home/donnadionne/grpc-git grpc-docker-server1 +# sh private_build_and_test.sh java cloud large_unary /usr/local/google/home/donnadionne/grpc-git +# =============================== + +# Arguments +LANGUAGE=$1 +ENV=$2 +TEST=$3 +GIT=$4 +PROJECT=${5:-"stoked-keyword-656"} +ZONE=${6:-"asia-east1-a"} +CLIENT=${7:-"grpc-docker-testclients1"} +SERVER=${8:-"grpc-docker-server"} + +current_time=$(date "+%Y-%m-%d-%H-%M-%S") +result_file_name=private_result.$current_time.txt + +sudo docker run --name="private_images" -v $GIT:/var/local/git-clone grpc/$LANGUAGE /var/local/git-clone/grpc/tools/dockerfile/grpc_$LANGUAGE/build.sh + +sudo docker commit -m "private image" -a $USER private_images grpc/private_images + +sudo docker tag -f grpc/private_images 0.0.0.0:5000/grpc/private_images + +sudo docker push 0.0.0.0:5000/grpc/private_images + +sudo docker rmi -f grpc/private_images + +sudo docker rm private_images + +gcloud compute --project $PROJECT ssh --zone $ZONE $CLIENT --command "sudo docker pull 0.0.0.0:5000/grpc/private_images" + +gcloud compute --project $PROJECT ssh --zone $ZONE $CLIENT --command "sudo docker tag 0.0.0.0:5000/grpc/private_images grpc/$LANGUAGE" + +source grpc_docker.sh + +if [ $ENV == 'interop' ] +then + grpc_interop_test $TEST $CLIENT $LANGUAGE $SERVER cxx + grpc_interop_test $TEST $CLIENT $LANGUAGE $SERVER java + grpc_interop_test $TEST $CLIENT $LANGUAGE $SERVER go + grpc_interop_test $TEST $CLIENT $LANGUAGE $SERVER ruby + grpc_interop_test $TEST $CLIENT $LANGUAGE $SERVER node + grpc_interop_test $TEST $CLIENT $LANGUAGE $SERVER python +else + if [ $ENV == 'cloud' ] + then + grpc_cloud_prod_test $TEST $CLIENT $LANGUAGE > /tmp/$result_file_name 2>&1 + gsutil cp /tmp/$result_file_name gs://$PROJECT-output/private_result/$result_file_name + else + grpc_cloud_prod_auth_test $TEST $CLIENT $LANGUAGE + fi +fi + diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 4e24f4b510..5165983d97 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -259,7 +259,7 @@ class Build(object): return [] def make_targets(self): - return ['all'] + return ['static'] def build_steps(self): return [] diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 5467bdb139..ad994e99a3 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -148,15 +148,6 @@ { "flaky": false, "language": "c", - "name": "chttp2_transport_end2end_test", - "platforms": [ - "windows", - "posix" - ] - }, - { - "flaky": false, - "language": "c", "name": "dualstack_socket_test", "platforms": [ "posix" @@ -471,15 +462,6 @@ { "flaky": false, "language": "c", - "name": "metadata_buffer_test", - "platforms": [ - "windows", - "posix" - ] - }, - { - "flaky": false, - "language": "c", "name": "multi_init_test", "platforms": [ "windows", @@ -910,7 +892,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_fake_security_invoke_large_request_test", "platforms": [ @@ -919,7 +901,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_fake_security_invoke_large_request_legacy_test", "platforms": [ @@ -1360,7 +1342,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_fullstack_invoke_large_request_test", "platforms": [ @@ -1369,7 +1351,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_fullstack_invoke_large_request_legacy_test", "platforms": [ @@ -1810,7 +1792,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_fullstack_uds_invoke_large_request_test", "platforms": [ @@ -1819,7 +1801,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_fullstack_uds_invoke_large_request_legacy_test", "platforms": [ @@ -2260,7 +2242,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_simple_ssl_fullstack_invoke_large_request_test", "platforms": [ @@ -2269,7 +2251,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_simple_ssl_fullstack_invoke_large_request_legacy_test", "platforms": [ @@ -2710,7 +2692,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_simple_ssl_with_oauth2_fullstack_invoke_large_request_test", "platforms": [ @@ -2719,7 +2701,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_simple_ssl_with_oauth2_fullstack_invoke_large_request_legacy_test", "platforms": [ @@ -3160,7 +3142,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_socket_pair_invoke_large_request_test", "platforms": [ @@ -3169,7 +3151,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_socket_pair_invoke_large_request_legacy_test", "platforms": [ @@ -3610,7 +3592,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_socket_pair_one_byte_at_a_time_invoke_large_request_test", "platforms": [ @@ -3619,7 +3601,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_socket_pair_one_byte_at_a_time_invoke_large_request_legacy_test", "platforms": [ @@ -4060,7 +4042,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_fullstack_invoke_large_request_unsecure_test", "platforms": [ @@ -4069,7 +4051,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_fullstack_invoke_large_request_legacy_unsecure_test", "platforms": [ @@ -4510,7 +4492,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_fullstack_uds_invoke_large_request_unsecure_test", "platforms": [ @@ -4519,7 +4501,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_fullstack_uds_invoke_large_request_legacy_unsecure_test", "platforms": [ @@ -4960,7 +4942,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_socket_pair_invoke_large_request_unsecure_test", "platforms": [ @@ -4969,7 +4951,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_socket_pair_invoke_large_request_legacy_unsecure_test", "platforms": [ @@ -5410,7 +5392,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_socket_pair_one_byte_at_a_time_invoke_large_request_unsecure_test", "platforms": [ @@ -5419,7 +5401,7 @@ ] }, { - "flaky": false, + "flaky": true, "language": "c", "name": "chttp2_socket_pair_one_byte_at_a_time_invoke_large_request_legacy_unsecure_test", "platforms": [ |