From a7224ce65ba17888d741064005174df7b55516b9 Mon Sep 17 00:00:00 2001 From: Garrett Jones Date: Wed, 31 Jan 2018 14:15:01 -0800 Subject: [PATCH 1/4] Adding bigquery, setting env vars in circle.yml --- .circleci/config.yml | 19 +++++++++++++++++++ utilities/verify_single_it.sh | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a0adfe7f24e9..f3be55762d8c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,6 +6,11 @@ anchor_docker: &anchor_docker environment: TERM: dumb +anchor_auth_vars: &anchor_auth_vars + environment: + GCLOUD_PROJECT: gcloud-devel + GOOGLE_APPLICATION_CREDENTIALS: .circleci/it-service-account.json + anchor_run_decrypt: &anchor_run_decrypt name: Decrypt credentials. command: | @@ -13,9 +18,21 @@ anchor_run_decrypt: &anchor_run_decrypt -out .circleci/it-service-account.json -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" jobs: + bigquery_it: + working_directory: ~/googleapis + <<: *anchor_docker + <<: *anchor_auth_vars + steps: + - checkout + - run: + <<: *anchor_run_decrypt + - run: + name: Run integration tests for google-cloud-bigquery + command: ./utilities/verify_single_it.sh google-cloud-bigquery datastore_it: working_directory: ~/googleapis <<: *anchor_docker + <<: *anchor_auth_vars steps: - checkout - run: @@ -26,6 +43,7 @@ jobs: speech_it: working_directory: ~/googleapis <<: *anchor_docker + <<: *anchor_auth_vars steps: - checkout - run: @@ -38,5 +56,6 @@ workflows: version: 2 build: jobs: + - bigquery_it - datastore_it - speech_it diff --git a/utilities/verify_single_it.sh b/utilities/verify_single_it.sh index 4d3841e4e68f..19952272c572 100755 --- a/utilities/verify_single_it.sh +++ b/utilities/verify_single_it.sh @@ -11,8 +11,8 @@ if [ -z $MODULE ]; then exit 1 fi -export GCLOUD_PROJECT="gcloud-devel" -export GOOGLE_APPLICATION_CREDENTIALS=$(realpath .circleci/it-service-account.json) +#export GCLOUD_PROJECT="gcloud-devel" +#export GOOGLE_APPLICATION_CREDENTIALS=$(realpath .circleci/it-service-account.json) echo "----- building and installing google-cloud-bom -----" mvn -B -pl google-cloud-bom install -DskipTests From e0336b5f4db35e5addbc2505ea850ef27f1eed8c Mon Sep 17 00:00:00 2001 From: Garrett Jones Date: Wed, 31 Jan 2018 14:20:46 -0800 Subject: [PATCH 2/4] fixes --- .circleci/config.yml | 8 ++++---- utilities/verify_single_it.sh | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f3be55762d8c..7df99256ecdc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ anchor_auth_vars: &anchor_auth_vars GOOGLE_APPLICATION_CREDENTIALS: .circleci/it-service-account.json anchor_run_decrypt: &anchor_run_decrypt - name: Decrypt credentials. + name: Decrypt credentials command: | openssl aes-256-cbc -md sha256 -d -in .circleci/it-service-account.json.enc \ -out .circleci/it-service-account.json -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" @@ -27,7 +27,7 @@ jobs: - run: <<: *anchor_run_decrypt - run: - name: Run integration tests for google-cloud-bigquery + name: Run integration tests command: ./utilities/verify_single_it.sh google-cloud-bigquery datastore_it: working_directory: ~/googleapis @@ -38,7 +38,7 @@ jobs: - run: <<: *anchor_run_decrypt - run: - name: Run integration tests for google-cloud-datastore + name: Run integration tests command: ./utilities/verify_single_it.sh google-cloud-datastore speech_it: working_directory: ~/googleapis @@ -49,7 +49,7 @@ jobs: - run: <<: *anchor_run_decrypt - run: - name: Run integration tests for google-cloud-speech + name: Run integration tests command: ./utilities/verify_single_it.sh google-cloud-speech workflows: diff --git a/utilities/verify_single_it.sh b/utilities/verify_single_it.sh index 19952272c572..0e5cd4fd1188 100755 --- a/utilities/verify_single_it.sh +++ b/utilities/verify_single_it.sh @@ -11,8 +11,8 @@ if [ -z $MODULE ]; then exit 1 fi -#export GCLOUD_PROJECT="gcloud-devel" -#export GOOGLE_APPLICATION_CREDENTIALS=$(realpath .circleci/it-service-account.json) +export GCLOUD_PROJECT="$GCLOUD_PROJECT" +export GOOGLE_APPLICATION_CREDENTIALS=$(realpath "$GOOGLE_APPLICATION_CREDENTIALS") echo "----- building and installing google-cloud-bom -----" mvn -B -pl google-cloud-bom install -DskipTests @@ -21,7 +21,7 @@ echo "----- building and installing parent pom -----" mvn -B -N install -DskipTests echo "----- building and installing shared modules -----" -mvn -B -pl google-cloud-core,google-cloud-core-http,google-cloud-core-grpc install -DskipTests +mvn -B -pl google-cloud-core,google-cloud-core-http,google-cloud-core-grpc,google-cloud-storage install -DskipTests echo "----- running integration tests -----" mvn -B -pl $MODULE -DtrimStackTrace=false -fae verify From 00ee85ae58534f4c08b2a69ab517be2e35763ea7 Mon Sep 17 00:00:00 2001 From: Garrett Jones Date: Wed, 31 Jan 2018 15:27:02 -0800 Subject: [PATCH 3/4] Adding more tests --- .circleci/config.yml | 90 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7df99256ecdc..3ce55961df38 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,8 +27,19 @@ jobs: - run: <<: *anchor_run_decrypt - run: - name: Run integration tests + name: Run integration tests for google-cloud-bigquery command: ./utilities/verify_single_it.sh google-cloud-bigquery + compute_it: + working_directory: ~/googleapis + <<: *anchor_docker + <<: *anchor_auth_vars + steps: + - checkout + - run: + <<: *anchor_run_decrypt + - run: + name: Run integration tests for google-cloud-compute + command: ./utilities/verify_single_it.sh google-cloud-compute datastore_it: working_directory: ~/googleapis <<: *anchor_docker @@ -38,8 +49,63 @@ jobs: - run: <<: *anchor_run_decrypt - run: - name: Run integration tests + name: Run integration tests for google-cloud-datastore command: ./utilities/verify_single_it.sh google-cloud-datastore + dns_it: + working_directory: ~/googleapis + <<: *anchor_docker + <<: *anchor_auth_vars + steps: + - checkout + - run: + <<: *anchor_run_decrypt + - run: + name: Run integration tests for google-cloud-dns + command: ./utilities/verify_single_it.sh google-cloud-dns + logging_it: + working_directory: ~/googleapis + <<: *anchor_docker + <<: *anchor_auth_vars + steps: + - checkout + - run: + <<: *anchor_run_decrypt + - run: + name: Run integration tests for google-cloud-logging + command: ./utilities/verify_single_it.sh google-cloud-logging + notification_it: + working_directory: ~/googleapis + <<: *anchor_docker + <<: *anchor_auth_vars + steps: + - checkout + - run: + <<: *anchor_run_decrypt + - run: + name: Run integration tests for google-cloud-notification + command: ./utilities/verify_single_it.sh google-cloud-notification + pubsub_it: + working_directory: ~/googleapis + <<: *anchor_docker + <<: *anchor_auth_vars + steps: + - checkout + - run: + <<: *anchor_run_decrypt + - run: + name: Run integration tests for google-cloud-pubsub + command: ./utilities/verify_single_it.sh google-cloud-pubsub + spanner_it: + working_directory: ~/googleapis + <<: *anchor_docker + <<: *anchor_auth_vars + steps: + - checkout + - run: + <<: *anchor_run_decrypt + - run: + name: Run integration tests for google-cloud-spanner + command: ./utilities/verify_single_it.sh google-cloud-spanner speech_it: working_directory: ~/googleapis <<: *anchor_docker @@ -49,13 +115,31 @@ jobs: - run: <<: *anchor_run_decrypt - run: - name: Run integration tests + name: Run integration tests for google-cloud-speech command: ./utilities/verify_single_it.sh google-cloud-speech + translate_it: + working_directory: ~/googleapis + <<: *anchor_docker + <<: *anchor_auth_vars + steps: + - checkout + - run: + <<: *anchor_run_decrypt + - run: + name: Run integration tests for google-cloud-translate + command: ./utilities/verify_single_it.sh google-cloud-translate workflows: version: 2 build: jobs: - bigquery_it + - compute_it - datastore_it + - dns_it + - logging_it + - notification_it + - pubsub_it + - spanner_it - speech_it + - translate_it From ac5f180faa8919cfb7f0c2e084ebdc019175f126 Mon Sep 17 00:00:00 2001 From: Garrett Jones Date: Wed, 31 Jan 2018 16:24:09 -0800 Subject: [PATCH 4/4] Fixing notification --- utilities/verify_single_it.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/verify_single_it.sh b/utilities/verify_single_it.sh index 0e5cd4fd1188..5a11a99bd644 100755 --- a/utilities/verify_single_it.sh +++ b/utilities/verify_single_it.sh @@ -21,7 +21,7 @@ echo "----- building and installing parent pom -----" mvn -B -N install -DskipTests echo "----- building and installing shared modules -----" -mvn -B -pl google-cloud-core,google-cloud-core-http,google-cloud-core-grpc,google-cloud-storage install -DskipTests +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 -----" mvn -B -pl $MODULE -DtrimStackTrace=false -fae verify