From 1a1369c24ec5214020bd26105100a6af92f27246 Mon Sep 17 00:00:00 2001
From: Garrett Jones <garrettjonesgoogle@users.noreply.github.com>
Date: Thu, 1 Feb 2018 15:44:04 -0800
Subject: [PATCH] CircleCI: Adding firestore, bumping compute timeout

---
 .circleci/config.yml                          |  20 ++++++++++++++++++
 .../firestore-it-service-account.json.enc     | Bin 0 -> 2384 bytes
 utilities/verify_single_it.sh                 |   2 ++
 3 files changed, 22 insertions(+)
 create mode 100644 .circleci/firestore-it-service-account.json.enc

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3ce55961df38..6ee839e5e26a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,6 +40,7 @@ jobs:
       - run:
           name: Run integration tests for google-cloud-compute
           command: ./utilities/verify_single_it.sh google-cloud-compute
+          no_output_timeout: 20m
   datastore_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -62,6 +63,24 @@ jobs:
       - run:
           name: Run integration tests for google-cloud-dns
           command: ./utilities/verify_single_it.sh google-cloud-dns
+  firestore_it:
+    working_directory: ~/googleapis
+    <<: *anchor_docker
+    environment:
+      # Firestore can't be turned on in a project with Datastore turned on,
+      # so we use a distinct project (and distinct service account) for it
+      GCLOUD_PROJECT: java-review
+      GOOGLE_APPLICATION_CREDENTIALS: .circleci/firestore-it-service-account.json
+    steps:
+      - checkout
+      - run:
+          name: Decrypt credentials
+          command: |
+            openssl aes-256-cbc -md sha256 -d -in .circleci/firestore-it-service-account.json.enc \
+                -out .circleci/firestore-it-service-account.json -k "${SYSTEM_TESTS_ENCRYPTION_KEY}"
+      - run:
+          name: Run integration tests for google-cloud-firestore
+          command: ./utilities/verify_single_it.sh google-cloud-firestore
   logging_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -136,6 +155,7 @@ workflows:
       - bigquery_it
       - compute_it
       - datastore_it
+      - firestore_it
       - dns_it
       - logging_it
       - notification_it
diff --git a/.circleci/firestore-it-service-account.json.enc b/.circleci/firestore-it-service-account.json.enc
new file mode 100644
index 0000000000000000000000000000000000000000..6a251918b792bbd8a6a8d5c6ebfadba23c8048e6
GIT binary patch
literal 2384
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
C5tBLq

literal 0
HcmV?d00001

diff --git a/utilities/verify_single_it.sh b/utilities/verify_single_it.sh
index 5a11a99bd644..8437edf60b46 100755
--- a/utilities/verify_single_it.sh
+++ b/utilities/verify_single_it.sh
@@ -21,6 +21,8 @@ echo "----- building and installing parent pom -----"
 mvn -B -N install -DskipTests
 
 echo "----- building and installing shared modules -----"
+# storage is present because google-cloud-bigquery and google-cloud-notification depend on it
+# pubsub is present because google-cloud-notification depends on it
 mvn -B -pl google-cloud-core,google-cloud-core-http,google-cloud-core-grpc,google-cloud-storage,google-cloud-pubsub install -DskipTests
 
 echo "----- running integration tests -----"