diff options
| author |  Yong Ni <yongni@google.com> | 2017-05-31 12:07:09 -0700 |
|---|---|---|
| committer | Yong Ni <yongni@google.com> | 2017-05-31 12:31:20 -0700 |
| commit | b92813b18b33af85699740962b4fe62d7ff4b3a9 (patch) | |
| tree | 034917e00443536d2443405b7a9a7dd52892ce0a /tools | |
| parent | bf2d87c816d59644bcafeb8384dd966c077fcae6 (diff) | |
Created a Java Oracle8 Dockerfile directory and moved all build_interop.sh to under template/. Added java_oracle8 to the client matrix.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/dockerfile/interoptest/grpc_interop_go/build_interop.sh | 1 | ||||
| -rw-r--r-- | tools/dockerfile/interoptest/grpc_interop_java/Dockerfile | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | tools/dockerfile/interoptest/grpc_interop_java/build_interop.sh | 1 | ||||
| -rw-r--r-- | tools/interop_matrix/client_matrix.py | 2 |
4 files changed, 5 insertions, 1 deletions
diff --git a/tools/dockerfile/interoptest/grpc_interop_go/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_go/build_interop.sh index 46aabc6b38..5eca90cdea 100755 --- a/tools/dockerfile/interoptest/grpc_interop_go/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_go/build_interop.sh @@ -45,3 +45,4 @@ cp -r /var/local/jenkins/service_account $HOME || true # Build the interop client and server (cd src/google.golang.org/grpc/interop/client && go install) (cd src/google.golang.org/grpc/interop/server && go install) + diff --git a/tools/dockerfile/interoptest/grpc_interop_java/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_java/Dockerfile index 2023467d59..61405ac172 100644 --- a/tools/dockerfile/interoptest/grpc_interop_java/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_java/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2015, Google Inc. +# Copyright 2017, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/dockerfile/interoptest/grpc_interop_java/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_java/build_interop.sh index 9997c63308..452b92eb05 100755..100644 --- a/tools/dockerfile/interoptest/grpc_interop_java/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_java/build_interop.sh @@ -40,3 +40,4 @@ cp -r /var/local/jenkins/service_account $HOME || true cd /var/local/git/grpc-java ./gradlew :grpc-interop-testing:installDist -PskipCodegen=true + diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py index b06b0b7205..8ee468ada7 100644 --- a/tools/interop_matrix/client_matrix.py +++ b/tools/interop_matrix/client_matrix.py @@ -39,10 +39,12 @@ def get_github_repo(lang): # Dictionary of runtimes per language LANG_RUNTIME_MATRIX = { 'go': ['go1.7', 'go1.8'], + 'java': ['java_oracle8'], } # Dictionary of releases per language. For each language, we need to provide # a tuple of release tag (used as the tag for the GCR image) and also github hash. LANG_RELEASE_MATRIX = { 'go': ['v1.0.1-GA', 'v1.3.0'], + 'java': ['v1.0.3', 'v1.1.2'], } |