Merge pull request #3330 from hzyi-google/spanner-gapic-migration

Merge master to spanner-gapic-migration

Author: yihanzhen

.circleci/config.yml

@@ -78,7 +78,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-bigquery
-          command: ./utilities/verify_single_it.sh google-cloud-bigquery
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-bigquery
 
   bigtable_it:
     working_directory: ~/googleapis
@@ -90,7 +90,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-bigtable
-          command: ./utilities/verify_single_it.sh google-cloud-bigtable -Dbigtable.env=prod -Dbigtable.table=projects/gcloud-devel/instances/google-cloud-bigtable/tables/integration-tests
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-bigtable -Dbigtable.env=prod -Dbigtable.table=projects/gcloud-devel/instances/google-cloud-bigtable/tables/integration-tests
 
   compute_it:
     working_directory: ~/googleapis
@@ -102,7 +102,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-compute
-          command: ./utilities/verify_single_it.sh google-cloud-compute
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-compute
           no_output_timeout: 20m
   datastore_it:
     working_directory: ~/googleapis
@@ -114,7 +114,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-datastore
-          command: ./utilities/verify_single_it.sh google-cloud-datastore
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-datastore
   dns_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -125,7 +125,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-dns
-          command: ./utilities/verify_single_it.sh google-cloud-dns
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-dns
   firestore_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -143,7 +143,7 @@ jobs:
                 -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
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-firestore
   logging_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -154,7 +154,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-logging
-          command: ./utilities/verify_single_it.sh google-cloud-logging
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-logging
   notification_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -165,7 +165,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-notification
-          command: ./utilities/verify_single_it.sh google-cloud-notification
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-notification
   pubsub_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -176,7 +176,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-pubsub
-          command: ./utilities/verify_single_it.sh google-cloud-pubsub
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-pubsub
   spanner_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -187,7 +187,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-spanner
-          command: ./utilities/verify_single_it.sh google-cloud-spanner
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-spanner
   speech_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -198,7 +198,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-speech
-          command: ./utilities/verify_single_it.sh google-cloud-speech
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-speech
   storage_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -209,7 +209,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-storage
-          command: ./utilities/verify_single_it.sh google-cloud-storage
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-storage
   translate_it:
     working_directory: ~/googleapis
     <<: *anchor_docker
@@ -220,7 +220,7 @@ jobs:
           <<: *anchor_run_decrypt
       - run:
           name: Run integration tests for google-cloud-translate
-          command: ./utilities/verify_single_it.sh google-cloud-translate
+          command: ./utilities/verify_single_it.sh google-cloud-clients/google-cloud-translate
   javadoc_test:
     working_directory: ~/googleapis
     <<: *anchor_docker