From 93dc7d93250a5d0568a5519d71fea90940f07739 Mon Sep 17 00:00:00 2001
From: Franziska Hinkelmann <franzih@chromium.org>
Date: Tue, 5 Jun 2018 19:18:24 -0400
Subject: [PATCH] Fix CircleCi for AppEngine/Storage

Drive-by fix: Delete files in bucket so the bucket gets deleted.
---
 appengine/storage/flexible/package.json            | 2 +-
 appengine/storage/flexible/system-test/app.test.js | 1 +
 appengine/storage/standard/package.json            | 2 +-
 appengine/storage/standard/system-test/app.test.js | 1 +
 circle.yml                                         | 3 ++-
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/appengine/storage/flexible/package.json b/appengine/storage/flexible/package.json
index 0a1900ff13..bb21894af4 100644
--- a/appengine/storage/flexible/package.json
+++ b/appengine/storage/flexible/package.json
@@ -16,7 +16,7 @@
     "pug": "2.0.3"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "2.2.5",
+    "@google-cloud/nodejs-repo-tools": "^2.3.0",
     "ava": "0.25.0"
   },
   "cloud-repo-tools": {
diff --git a/appengine/storage/flexible/system-test/app.test.js b/appengine/storage/flexible/system-test/app.test.js
index f6750408b7..98f4cd9d18 100644
--- a/appengine/storage/flexible/system-test/app.test.js
+++ b/appengine/storage/flexible/system-test/app.test.js
@@ -36,6 +36,7 @@ test.before(async () => {
 });
 test.after.always(async () => {
   try {
+    await bucket.deleteFiles();
     await bucket.delete();
   } catch (err) {} // ignore error
 });
diff --git a/appengine/storage/standard/package.json b/appengine/storage/standard/package.json
index 0106d6c427..e64893a604 100644
--- a/appengine/storage/standard/package.json
+++ b/appengine/storage/standard/package.json
@@ -16,7 +16,7 @@
     "pug": "2.0.3"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "2.2.5",
+    "@google-cloud/nodejs-repo-tools": "^2.3.0",
     "ava": "0.25.0"
   },
   "cloud-repo-tools": {
diff --git a/appengine/storage/standard/system-test/app.test.js b/appengine/storage/standard/system-test/app.test.js
index f6750408b7..98f4cd9d18 100644
--- a/appengine/storage/standard/system-test/app.test.js
+++ b/appengine/storage/standard/system-test/app.test.js
@@ -36,6 +36,7 @@ test.before(async () => {
 });
 test.after.always(async () => {
   try {
+    await bucket.deleteFiles();
     await bucket.delete();
   } catch (err) {} // ignore error
 });
diff --git a/circle.yml b/circle.yml
index f35ac43d23..59a83a6d4e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -105,7 +105,8 @@ deployment:
       - node scripts/build "appengine/metadata/flexible"
       - node scripts/build "appengine/metadata/standard"
       - node scripts/build "appengine/static-files"
-      - GCLOUD_STORAGE_BUCKET=docs-samples-gae-test-$(uuid); node scripts/build "appengine/storage"
+      - GCLOUD_STORAGE_BUCKET=docs-samples-gae-test-$(uuid); node scripts/build "appengine/storage/flexible"
+      - GCLOUD_STORAGE_BUCKET=docs-samples-gae-test-$(uuid); node scripts/build "appengine/storage/standard"
       - node scripts/build "auth"
       - node scripts/build "appengine/pubsub"
       - export GCP_QUEUE=nodejs-test-queue-do-not-delete; node scripts/build "cloudtasks"