Use valid format for App Engine version string (#663)

argument --version/-v: Bad value [doc-sample-appengine/hello-world/standard-standard]: May only contain lowercase letters, digits, and hyphens. Must begin and end with a letter or digit. Must not exceed 63 characters.
GoogleCloudPlatform · Jun 15, 2018 · 12a666d · 12a666d
1 parent 6d2e1aa
commit 12a666d
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 37 deletions.
diff --git a/.kokoro/appengine/test-deployment/hello-world-flex.cfg b/.kokoro/appengine/test-deployment/hello-world-flex.cfg
@@ -4,10 +4,4 @@
 env_vars: {
  key: "PROJECT"
  value: "appengine/hello-world/flexible"
-}
-
-# flexible or standard
-env_vars: {
- key: "APPENGINE_ENVIRONMENT"
- value: "flexible"
 }
diff --git a/.kokoro/appengine/test-deployment/hello-world-standard.cfg b/.kokoro/appengine/test-deployment/hello-world-standard.cfg
@@ -4,10 +4,4 @@
 env_vars: {
  key: "PROJECT"
  value: "appengine/hello-world/standard"
-}
-
-# flexible or standard
-env_vars: {
- key: "APPENGINE_ENVIRONMENT"
- value: "standard"
 }
diff --git a/.kokoro/appengine/test-deployment/metadata-flex.cfg b/.kokoro/appengine/test-deployment/metadata-flex.cfg
@@ -4,10 +4,4 @@
 env_vars: {
  key: "PROJECT"
  value: "appengine/metadata/flexible"
-}
-
-# flexible or standard
-env_vars: {
- key: "APPENGINE_ENVIRONMENT"
- value: "flexible"
 }
diff --git a/.kokoro/appengine/test-deployment/metadata-standard.cfg b/.kokoro/appengine/test-deployment/metadata-standard.cfg
@@ -4,10 +4,4 @@
 env_vars: {
  key: "PROJECT"
  value: "appengine/metadata/standard"
-}
-
-# flexible or standard
-env_vars: {
- key: "APPENGINE_ENVIRONMENT"
- value: "standard"
 }
diff --git a/.kokoro/appengine/test-deployment/storage-flex.cfg b/.kokoro/appengine/test-deployment/storage-flex.cfg
@@ -4,10 +4,4 @@
 env_vars: {
  key: "PROJECT"
  value: "appengine/storage/flexible"
-}
-
-# flexible or standard
-env_vars: {
- key: "APPENGINE_ENVIRONMENT"
- value: "flexible"
 }
diff --git a/.kokoro/appengine/test-deployment/storage-standard.cfg b/.kokoro/appengine/test-deployment/storage-standard.cfg
@@ -4,10 +4,4 @@
 env_vars: {
  key: "PROJECT"
  value: "appengine/storage/standard"
-}
-
-# flexible or standard
-env_vars: {
- key: "APPENGINE_ENVIRONMENT"
- value: "standard"
 }
diff --git a/.kokoro/build-with-appengine.sh b/.kokoro/build-with-appengine.sh
@@ -24,7 +24,7 @@ gcloud auth activate-service-account --key-file "$GOOGLE_APPLICATION_CREDENTIALS
 gcloud config set project $GCLOUD_PROJECT
 
 export NODE_ENV=development
-export GAE_VERSION=doc-sample-${PROJECT}-${APPENGINE_ENVIRONMENT}
+export GAE_VERSION=doc-sample-$(echo $PROJECT | sed 's_/_-_g')
 
 # Register post-test cleanup
 function cleanup {