Delete Kokoro tests that fail locally

For almost all tests, run only `npm run`, do not deploy to App Engine. Only for the tests in `test-deployment`, check the full deployment.
GoogleCloudPlatform · Jun 13, 2018 · 849ada3 · 849ada3
1 parent a427810
commit 849ada3
Show file tree

Hide file tree

Showing 38 changed files with 19 additions and 394 deletions.
diff --git a/.kokoro/appengine/analytics-flex.cfg b/.kokoro/appengine/analytics-flex.cfg
diff --git a/.kokoro/appengine/analytics-standard.cfg b/.kokoro/appengine/analytics-standard.cfg
diff --git a/.kokoro/appengine/mailjet-flex.cfg → .kokoro/appengine/analytics.cfg b/.kokoro/appengine/mailjet-flex.cfg → .kokoro/appengine/analytics.cfg
@@ -1,13 +1,7 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-# Set GAE environment
-env_vars: {
- key: "APPENGINE_ENVIRONMENT"
- value: "flexible"
-}
-
 # Set the folder in which the tests are run
 env_vars: {
  key: "PROJECT"
- value: "mailjet"
+ value: "appengine/analytics"
 }
diff --git a/.kokoro/appengine/build.sh b/.kokoro/appengine/build.sh
diff --git a/.kokoro/appengine/common.cfg b/.kokoro/appengine/common.cfg
@@ -18,5 +18,5 @@ env_vars: {
 # Tell the trampoline which build file to use.
 env_vars: {
  key: "TRAMPOLINE_BUILD_FILE"
- value: "github/nodejs-docs-samples/.kokoro/appengine/build.sh"
+ value: "github/nodejs-docs-samples/.kokoro/build.sh"
 }
diff --git a/.kokoro/appengine/datastore-flex.cfg b/.kokoro/appengine/datastore-flex.cfg
diff --git a/.kokoro/appengine/mailjet-standard.cfg → .kokoro/appengine/datastore.cfg b/.kokoro/appengine/mailjet-standard.cfg → .kokoro/appengine/datastore.cfg
@@ -1,13 +1,7 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-# Set GAE environment
-env_vars: {
- key: "APPENGINE_ENVIRONMENT"
- value: "standard"
-}
-
 # Set the folder in which the tests are run
 env_vars: {
  key: "PROJECT"
- value: "mailjet"
+ value: "appengine/datastore"
 }
diff --git a/.kokoro/appengine/default-yml/build.sh b/.kokoro/appengine/default-yml/build.sh
diff --git a/.kokoro/appengine/endpoints-flex.cfg b/.kokoro/appengine/endpoints-flex.cfg
diff --git a/.kokoro/appengine/endpoints-standard.cfg b/.kokoro/appengine/endpoints-standard.cfg
diff --git a/.kokoro/appengine/errorreporting-flex.cfg b/.kokoro/appengine/errorreporting-flex.cfg
diff --git a/.kokoro/appengine/errorreporting-standard.cfg b/.kokoro/appengine/errorreporting-standard.cfg
diff --git a/.kokoro/appengine/datastore-standard.cfg → .kokoro/appengine/mailjet.cfg b/.kokoro/appengine/datastore-standard.cfg → .kokoro/appengine/mailjet.cfg
@@ -1,13 +1,7 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-# Set GAE environment
-env_vars: {
- key: "APPENGINE_ENVIRONMENT"
- value: "standard"
-}
-
 # Set the folder in which the tests are run
 env_vars: {
  key: "PROJECT"
- value: "datastore"
+ value: "appengine/mailjet"
 }
diff --git a/.kokoro/appengine/pubsub-flex.cfg b/.kokoro/appengine/pubsub-flex.cfg
diff --git a/.kokoro/appengine/pubsub-standard.cfg b/.kokoro/appengine/pubsub-standard.cfg
diff --git a/.kokoro/appengine/static-files-flex.cfg b/.kokoro/appengine/static-files-flex.cfg
diff --git a/.kokoro/appengine/static-files-standard.cfg b/.kokoro/appengine/static-files-standard.cfg
diff --git a/.kokoro/appengine/default-yml/common.cfg → .kokoro/appengine/test-deployment/common.cfg b/.kokoro/appengine/default-yml/common.cfg → .kokoro/appengine/test-deployment/common.cfg
@@ -18,5 +18,5 @@ env_vars: {
 # Tell the trampoline which build file to use.
 env_vars: {
  key: "TRAMPOLINE_BUILD_FILE"
- value: "github/nodejs-docs-samples/.kokoro/appengine/default-yml/build.sh"
+ value: "github/nodejs-docs-samples/.kokoro/build-with-appengine.sh"
 }
diff --git a/...ppengine/default-yml/hello-world-flex.cfg → ...gine/test-deployment/hello-world-flex.cfg b/...ppengine/default-yml/hello-world-flex.cfg → ...gine/test-deployment/hello-world-flex.cfg
@@ -9,5 +9,5 @@ env_vars: {
 # Set the folder in which the tests are run
 env_vars: {
  key: "PROJECT"
- value: "hello-worl"
+ value: "hello-world"
 }
diff --git a/...gine/default-yml/hello-world-standard.cfg → .../test-deployment/hello-world-standard.cfg b/...gine/default-yml/hello-world-standard.cfg → .../test-deployment/hello-world-standard.cfg
@@ -9,5 +9,5 @@ env_vars: {
 # Set the folder in which the tests are run
 env_vars: {
  key: "PROJECT"
- value: "hello-worl"
+ value: "hello-world"
 }
diff --git a/...o/appengine/default-yml/metadata-flex.cfg → ...pengine/test-deployment/metadata-flex.cfg b/...o/appengine/default-yml/metadata-flex.cfg → ...pengine/test-deployment/metadata-flex.cfg
diff --git a/...pengine/default-yml/metadata-standard.cfg → ...ine/test-deployment/metadata-standard.cfg b/...pengine/default-yml/metadata-standard.cfg → ...ine/test-deployment/metadata-standard.cfg
diff --git a/...ro/appengine/default-yml/storage-flex.cfg → ...ppengine/test-deployment/storage-flex.cfg b/...ro/appengine/default-yml/storage-flex.cfg → ...ppengine/test-deployment/storage-flex.cfg
diff --git a/...ppengine/default-yml/storage-standard.cfg → ...gine/test-deployment/storage-standard.cfg b/...ppengine/default-yml/storage-standard.cfg → ...gine/test-deployment/storage-standard.cfg
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -15,7 +15,6 @@
 # limitations under the License.
 
 export GCLOUD_PROJECT=nodejs-docs-samples-tests
-
 export NODE_ENV=development
 
 cd github/nodejs-docs-samples/${PROJECT}
@@ -28,7 +27,6 @@ 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
 
-# Test the deployed app
 npm test
 
 exit $?
diff --git a/.kokoro/cloudtasks.cfg b/.kokoro/cloudtasks.cfg