From 6ae9c6e3aa735682710aa92bbb80f21790b03574 Mon Sep 17 00:00:00 2001 From: Shubha Rajan Date: Tue, 5 May 2020 11:04:25 -0700 Subject: [PATCH] update .kokoro/build.sh to run proxy when testing Cloud SQL samples --- .kokoro/build.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 9df9f923b0..6e4f912625 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -33,10 +33,13 @@ export DB_USER="kokoro_ci" export DB_PASS=$(cat $KOKORO_GFILE_DIR/secrets-sql-password.txt) if [[ $SQL_CLIENT == 'pg' ]]; then export CONNECTION_NAME=$(cat $KOKORO_GFILE_DIR/secrets-pg-connection-name.txt) -else +elif [[ $SQL_CLIENT == 'sqlserver' ]]; then + export CONNECTION_NAME=$(cat $KOKORO_GFILE_DIR/secrets-sqlserver-connection-name.txt) +elif [[ $SQL_CLIENT == 'mysql' ]]; then export CONNECTION_NAME=$(cat $KOKORO_GFILE_DIR/secrets-mysql-connection-name.txt) fi + # Configure Sendgrid variables export SENDGRID_SENDER="test@google.com" export SENDGRID_API_KEY=$(cat $KOKORO_GFILE_DIR/secrets-sendgrid-api-key.txt) @@ -88,6 +91,18 @@ export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/secrets-key.json gcloud auth activate-service-account --key-file "$GOOGLE_APPLICATION_CREDENTIALS" gcloud config set project $GCLOUD_PROJECT +# Download and run the proxy if testing a Cloud SQL sample +if [[ $SQL_CLIENT ]]; then + wget --quiet https://dl.google.com/cloudsql/cloud_sql_proxy.linux.amd64 -O cloud_sql_proxy + chmod +x cloud_sql_proxy + if [[ $SQL_CLIENT == 'sqlserver' ]]; then + ./cloud_sql_proxy -instances="${CONNECTION_NAME}"=tcp:1433 &>> cloud_sql_proxy.log & + else + mkdir /cloudsql; chmod 777 /cloudsql + ./cloud_sql_proxy -dir=/cloudsql -instances="${CONNECTION_NAME}" &>> cloud_sql_proxy.log & + fi +fi + # If tests are running against master, configure Build Cop # to open issues on failures: if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"release"* ]]; then