From 667669de7542356774d3c18060db05c1eb9cddc9 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 20 Sep 2018 10:33:41 -0700 Subject: [PATCH 1/2] Add Kokoro continuous integration config and badges --- .kokoro/continuous/common.cfg | 24 ++++++++++++++++++++++++ .kokoro/continuous/java10.cfg | 7 +++++++ .kokoro/continuous/java7.cfg | 7 +++++++ .kokoro/continuous/java8.cfg | 7 +++++++ README.md | 8 ++++++++ 5 files changed, 53 insertions(+) create mode 100644 .kokoro/continuous/common.cfg create mode 100644 .kokoro/continuous/java10.cfg create mode 100644 .kokoro/continuous/java7.cfg create mode 100644 .kokoro/continuous/java8.cfg diff --git a/.kokoro/continuous/common.cfg b/.kokoro/continuous/common.cfg new file mode 100644 index 000000000..582175deb --- /dev/null +++ b/.kokoro/continuous/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "google-http-java-client/.kokoro/trampoline.sh" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/google-http-java-client/.kokoro/build.sh" +} + +env_vars: { + key: "JOB_TYPE" + value: "test" +} diff --git a/.kokoro/continuous/java10.cfg b/.kokoro/continuous/java10.cfg new file mode 100644 index 000000000..e560ae22f --- /dev/null +++ b/.kokoro/continuous/java10.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java10" +} diff --git a/.kokoro/continuous/java7.cfg b/.kokoro/continuous/java7.cfg new file mode 100644 index 000000000..584e8ea60 --- /dev/null +++ b/.kokoro/continuous/java7.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java7" +} diff --git a/.kokoro/continuous/java8.cfg b/.kokoro/continuous/java8.cfg new file mode 100644 index 000000000..34f6c33e5 --- /dev/null +++ b/.kokoro/continuous/java8.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} diff --git a/README.md b/README.md index 15882a9f5..5d536c1b2 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,14 @@ are welcome. - [Release Notes](https://developers.google.com/api-client-library/java/google-http-java-client/release-notes) - [Support (Questions, Bugs)](https://developers.google.com/api-client-library/java/google-http-java-client/support) +## CI Status + +Java Version | Status +------------ | ------ +Java 7 | [![Kokoro CI](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java7.svg)](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java7.html) +Java 8 | [![Kokoro CI](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java8.svg)](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java8.html) +Java 10 | [![Kokoro CI](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java10.svg)](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java10.html) + ## Links - [Announcements](http://google-http-java-client.blogspot.com/) From f70b3a5975efd5f910eb56fed5f9ed97638d0d18 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 21 Sep 2018 09:26:04 -0700 Subject: [PATCH 2/2] Fix indentation and other PR comments --- .kokoro/continuous/common.cfg | 8 ++++---- .kokoro/continuous/java10.cfg | 4 ++-- .kokoro/continuous/java7.cfg | 4 ++-- .kokoro/continuous/java8.cfg | 4 ++-- .kokoro/presubmit/common.cfg | 8 ++++---- .kokoro/presubmit/java10.cfg | 4 ++-- .kokoro/presubmit/java7.cfg | 4 ++-- .kokoro/presubmit/java8.cfg | 4 ++-- README.md | 7 +++---- 9 files changed, 23 insertions(+), 24 deletions(-) diff --git a/.kokoro/continuous/common.cfg b/.kokoro/continuous/common.cfg index 582175deb..a5178e08c 100644 --- a/.kokoro/continuous/common.cfg +++ b/.kokoro/continuous/common.cfg @@ -14,11 +14,11 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" build_file: "google-http-java-client/.kokoro/trampoline.sh" env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/google-http-java-client/.kokoro/build.sh" + key: "TRAMPOLINE_BUILD_FILE" + value: "github/google-http-java-client/.kokoro/build.sh" } env_vars: { - key: "JOB_TYPE" - value: "test" + key: "JOB_TYPE" + value: "test" } diff --git a/.kokoro/continuous/java10.cfg b/.kokoro/continuous/java10.cfg index e560ae22f..6e2f1f5fa 100644 --- a/.kokoro/continuous/java10.cfg +++ b/.kokoro/continuous/java10.cfg @@ -2,6 +2,6 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java10" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java10" } diff --git a/.kokoro/continuous/java7.cfg b/.kokoro/continuous/java7.cfg index 584e8ea60..cb24f44ee 100644 --- a/.kokoro/continuous/java7.cfg +++ b/.kokoro/continuous/java7.cfg @@ -2,6 +2,6 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java7" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java7" } diff --git a/.kokoro/continuous/java8.cfg b/.kokoro/continuous/java8.cfg index 34f6c33e5..3b017fc80 100644 --- a/.kokoro/continuous/java8.cfg +++ b/.kokoro/continuous/java8.cfg @@ -2,6 +2,6 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" } diff --git a/.kokoro/presubmit/common.cfg b/.kokoro/presubmit/common.cfg index 582175deb..a5178e08c 100644 --- a/.kokoro/presubmit/common.cfg +++ b/.kokoro/presubmit/common.cfg @@ -14,11 +14,11 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" build_file: "google-http-java-client/.kokoro/trampoline.sh" env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/google-http-java-client/.kokoro/build.sh" + key: "TRAMPOLINE_BUILD_FILE" + value: "github/google-http-java-client/.kokoro/build.sh" } env_vars: { - key: "JOB_TYPE" - value: "test" + key: "JOB_TYPE" + value: "test" } diff --git a/.kokoro/presubmit/java10.cfg b/.kokoro/presubmit/java10.cfg index e560ae22f..6e2f1f5fa 100644 --- a/.kokoro/presubmit/java10.cfg +++ b/.kokoro/presubmit/java10.cfg @@ -2,6 +2,6 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java10" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java10" } diff --git a/.kokoro/presubmit/java7.cfg b/.kokoro/presubmit/java7.cfg index 584e8ea60..cb24f44ee 100644 --- a/.kokoro/presubmit/java7.cfg +++ b/.kokoro/presubmit/java7.cfg @@ -2,6 +2,6 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java7" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java7" } diff --git a/.kokoro/presubmit/java8.cfg b/.kokoro/presubmit/java8.cfg index 34f6c33e5..3b017fc80 100644 --- a/.kokoro/presubmit/java8.cfg +++ b/.kokoro/presubmit/java8.cfg @@ -2,6 +2,6 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" } diff --git a/README.md b/README.md index 5d536c1b2..89c7091db 100644 --- a/README.md +++ b/README.md @@ -40,11 +40,10 @@ are welcome. Java Version | Status ------------ | ------ -Java 7 | [![Kokoro CI](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java7.svg)](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java7.html) -Java 8 | [![Kokoro CI](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java8.svg)](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java8.html) -Java 10 | [![Kokoro CI](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java10.svg)](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java10.html) +Java 7 | [![Kokoro CI](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java7.svg)](https://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java7.html) +Java 8 | [![Kokoro CI](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java8.svg)](https://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java8.html) +Java 10 | [![Kokoro CI](http://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java10.svg)](https://storage.googleapis.com/cloud-devrel-public/java/badges/google-http-java-client/java10.html) ## Links -- [Announcements](http://google-http-java-client.blogspot.com/) - [Discuss](http://groups.google.com/group/google-http-java-client)