Merge pull request #13398 from adelez/csharp_101
Adding v1.7.x for some languages
This commit is contained in:
adelez
GitHub
commit
2d21eba283
|
|
@ -8,8 +8,8 @@ from specific releases/tag, are used to test version compatiblity between gRPC r
|
|||
## Step-by-step instructions for adding a GCR image for a new release for compatibility test
|
||||
We have continuous nightly test setup to test gRPC backward compatibility between old clients and latest server. When a gRPC developer creates a new gRPC release, s/he is also responsible to add the just-released gRPC client to the nightly test. The steps are:
|
||||
- Add (or update) an entry in `./client_matrix.py` file to reference the github tag for the release.
|
||||
- Build new client docker image(s). For example, for java release `v1.9.9`, do
|
||||
- `tools/interop_matrix/create_matrix_images.py --git_checkout --release=v1.9.9 --language=java`
|
||||
- Build new client docker image(s). For example, for C and wrapper languages release `v1.9.9`, do
|
||||
- `tools/interop_matrix/create_matrix_images.py --git_checkout --release=v1.9.9 --language cxx csharp python ruby php`
|
||||
- Verify that the new docker image was built successfully and uploaded to GCR. For example,
|
||||
- `gcloud beta container images list --repository gcr.io/grpc-testing` shows image repos.
|
||||
- `gcloud beta container images list-tags gcr.io/grpc-testing/grpc_interop_java_oracle8` should show an image entry with tag `v1.9.9`.
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ def get_github_repo(lang):
|
|||
return {
|
||||
'go': 'git@github.com:grpc/grpc-go.git',
|
||||
'java': 'git@github.com:grpc/grpc-java.git',
|
||||
'node': 'git@github.com:grpc/grpc-node.git',
|
||||
# all other languages use the grpc.git repo.
|
||||
}.get(lang, 'git@github.com:grpc/grpc.git')
|
||||
|
||||
|
|
@ -44,6 +45,7 @@ LANG_RELEASE_MATRIX = {
|
|||
'v1.3.9',
|
||||
'v1.4.2',
|
||||
'v1.6.6',
|
||||
'v1.7.2',
|
||||
],
|
||||
'go': [
|
||||
'v1.0.5',
|
||||
|
|
@ -77,6 +79,24 @@ LANG_RELEASE_MATRIX = {
|
|||
'v1.4.2',
|
||||
'v1.6.6',
|
||||
],
|
||||
'python': [
|
||||
'v1.0.x',
|
||||
'v1.1.4',
|
||||
'v1.2.5',
|
||||
'v1.3.9',
|
||||
'v1.4.2',
|
||||
'v1.6.6',
|
||||
'v1.7.2',
|
||||
],
|
||||
'python': [
|
||||
'v1.0.x',
|
||||
'v1.1.4',
|
||||
'v1.2.5',
|
||||
'v1.3.9',
|
||||
'v1.4.2',
|
||||
'v1.6.6',
|
||||
'v1.7.2',
|
||||
],
|
||||
'node': [
|
||||
'v1.0.1',
|
||||
'v1.1.4',
|
||||
|
|
@ -84,6 +104,7 @@ LANG_RELEASE_MATRIX = {
|
|||
'v1.3.9',
|
||||
'v1.4.2',
|
||||
'v1.6.6',
|
||||
'v1.7.1',
|
||||
],
|
||||
'ruby': [
|
||||
# Ruby v1.0.x doesn't have the fix #8914, therefore not supported.
|
||||
|
|
@ -92,6 +113,7 @@ LANG_RELEASE_MATRIX = {
|
|||
'v1.3.9',
|
||||
'v1.4.2',
|
||||
'v1.6.6',
|
||||
'v1.7.2',
|
||||
],
|
||||
'php': [
|
||||
'v1.0.1',
|
||||
|
|
@ -100,6 +122,7 @@ LANG_RELEASE_MATRIX = {
|
|||
'v1.3.9',
|
||||
'v1.4.2',
|
||||
'v1.6.6',
|
||||
'v1.7.2',
|
||||
],
|
||||
'csharp': [
|
||||
#'v1.0.1',
|
||||
|
|
@ -108,5 +131,6 @@ LANG_RELEASE_MATRIX = {
|
|||
'v1.3.9',
|
||||
'v1.4.2',
|
||||
'v1.6.6',
|
||||
'v1.7.2',
|
||||
],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -77,6 +77,15 @@ argp.add_argument('--keep',
|
|||
action='store_true',
|
||||
help='keep the created local images after uploading to GCR')
|
||||
|
||||
argp.add_argument('--reuse_git_root',
|
||||
default=False,
|
||||
action='store_const',
|
||||
const=True,
|
||||
help='reuse the repo dir. If False, the existing git root '
|
||||
'directory will removed before a clean checkout, because '
|
||||
'reusing the repo can cause git checkout error if you switch '
|
||||
'between releases.')
|
||||
|
||||
|
||||
args = argp.parse_args()
|
||||
|
||||
|
|
@ -133,7 +142,7 @@ def build_image_jobspec(runtime, env, gcr_tag, stack_base):
|
|||
}
|
||||
build_env.update(env)
|
||||
build_job = jobset.JobSpec(
|
||||
cmdline=[os.path.join(stack_base, _IMAGE_BUILDER)],
|
||||
cmdline=[_IMAGE_BUILDER],
|
||||
environ=build_env,
|
||||
shortname='build_docker_%s' % runtime,
|
||||
timeout_seconds=30*60)
|
||||
|
|
@ -227,6 +236,11 @@ def checkout_grpc_stack(lang, release):
|
|||
repo_dir = os.path.splitext(os.path.basename(repo))[0]
|
||||
stack_base = os.path.join(args.git_checkout_root, repo_dir)
|
||||
|
||||
# Clean up leftover repo dir if necessary.
|
||||
if not args.reuse_git_root and os.path.exists(stack_base):
|
||||
jobset.message('START', 'Removing git checkout root.', do_newline=True)
|
||||
shutil.rmtree(stack_base)
|
||||
|
||||
if not os.path.exists(stack_base):
|
||||
subprocess.check_call(['git', 'clone', '--recursive', repo],
|
||||
cwd=os.path.dirname(stack_base))
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
#!/bin/bash
|
||||
echo "Testing ${docker_image:=grpc_interop_node:a53aa5e3-b548-4566-b5a8-6d15c1315b32}"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_00c688f2-57da-4023-89f3-46b1f7b5869f $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_d86705d8-14ea-4024-90b6-de74d6e8d19c $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_ebaafacd-1d82-4a75-bea1-a5c64e01fcaf $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_5125241a-fbf6-4c1c-895b-026a5a41f02f $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_3d5e5b82-7205-4eba-b775-8122f05a4760 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_16fa0b49-2083-4932-8f26-79cfdffec940 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_23cee670-2d8d-4f5c-8893-c3c43da8b03a $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_7b6a9454-e3b6-4993-b542-468e268930aa $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_5a7109ed-c065-4b62-98f4-b3ed8f385762 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_1e0ba8dd-4dc1-431b-b202-529e7ace5d1d $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_649de56a-e722-4a59-b265-e9c0e871f068 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_8be512a2-5e1c-4858-8cfc-82f99b678b76 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_d19b6333-e528-48b5-8421-2ae3f7ce9dab $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_4749c80a-21c5-4d81-9df5-3c46ba6480cd $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_b7bee545-4857-4269-a1f2-9553dfc7e4b8 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_4e96db87-6f48-426d-a7f0-97f3a5b6b3f4 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_31a1d58c-f8bf-460a-af60-28969ecaaf80 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_ce64b147-bcfa-44b2-a2f7-4a485380ce30 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_00c688f2-57da-4023-89f3-46b1f7b5869f $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_d86705d8-14ea-4024-90b6-de74d6e8d19c $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_ebaafacd-1d82-4a75-bea1-a5c64e01fcaf $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_5125241a-fbf6-4c1c-895b-026a5a41f02f $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_3d5e5b82-7205-4eba-b775-8122f05a4760 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_16fa0b49-2083-4932-8f26-79cfdffec940 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_23cee670-2d8d-4f5c-8893-c3c43da8b03a $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_7b6a9454-e3b6-4993-b542-468e268930aa $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_5a7109ed-c065-4b62-98f4-b3ed8f385762 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_1e0ba8dd-4dc1-431b-b202-529e7ace5d1d $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_649de56a-e722-4a59-b265-e9c0e871f068 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_8be512a2-5e1c-4858-8cfc-82f99b678b76 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_d19b6333-e528-48b5-8421-2ae3f7ce9dab $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_4749c80a-21c5-4d81-9df5-3c46ba6480cd $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_b7bee545-4857-4269-a1f2-9553dfc7e4b8 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_4e96db87-6f48-426d-a7f0-97f3a5b6b3f4 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_31a1d58c-f8bf-460a-af60-28969ecaaf80 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response"
|
||||
docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_ce64b147-bcfa-44b2-a2f7-4a485380ce30 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue