From d03fdb9a019eb000ddf769fe381fbbf984d7e584 Mon Sep 17 00:00:00 2001
From: Stephen Sawchuk <sawchuk@gmail.com>
Date: Wed, 29 Mar 2017 13:40:57 -0400
Subject: [PATCH] ci: correct tagged commit recognition

---
 scripts/circle/test.sh | 6 +++---
 system-test/env.js     | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/scripts/circle/test.sh b/scripts/circle/test.sh
index cd052cf1c1f..26c36d7da72 100755
--- a/scripts/circle/test.sh
+++ b/scripts/circle/test.sh
@@ -25,10 +25,10 @@ rebuild () {
   done
 }
 
-if [ "${CIRCLE_BRANCH}" == "master" ] &&
-   ([ "${CI_PULL_REQUEST}" == "" ] || [ "${CIRCLE_TAG}" != "" ])
+if [ "${CIRCLE_TAG}" != "" ] ||
+   ([ "${CIRCLE_BRANCH}" == "master" ] && [ "${CI_PULL_REQUEST}" == "" ])
 then
-  # This is a push to master, so system tests will be run.
+  # This is a tagged build or a push to master, so system tests will be run.
   echo $GCLOUD_TESTS_KEY | base64 --decode > ${HOME}/key.json
   export GCLOUD_TESTS_KEY="$HOME/key.json"
 fi
diff --git a/system-test/env.js b/system-test/env.js
index e0d94985e15..2a21b366adc 100644
--- a/system-test/env.js
+++ b/system-test/env.js
@@ -20,6 +20,3 @@ module.exports = {
   projectId: process.env.GCLOUD_TESTS_PROJECT_ID,
   keyFilename: process.env.GCLOUD_TESTS_KEY
 };
-
-console.log('google-cloud-node configuration');
-console.log(module.exports);