Merge pull request GoogleCloudPlatform#28 from bshaffer/misc-fixes-for-e2e-tests

misc fixes for e2e test script, fixes permissions for symfony

Author: bshaffer

managed_vms/drupal8/tests/run-tests.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 set -e
+set -o xtrace
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 SAMPLE_DIR="${DIR}/.."
 DRUPAL_DIR="${SAMPLE_DIR}/drupal8.test"
 
 VARS=(
     GOOGLE_PROJECT_ID
-    GOOGLE_VERSION_ID
     DRUPAL_ADMIN_USERNAME
     DRUPAL_ADMIN_PASSWORD
     DRUPAL_DATABASE_NAME
@@ -63,11 +63,35 @@ drupal cache:rebuild all
 # Copy configuration files to the drupal project
 cp $SAMPLE_DIR/{app.yaml,php.ini,Dockerfile,nginx-app.conf} $DRUPAL_DIR
 
-# Deploy to gcloud
-gcloud preview app deploy \
-  --no-promote --quiet --stop-previous-version --force \
-  --project=${GOOGLE_PROJECT_ID} \
-  --version=${GOOGLE_VERSION_ID}
+# Deploy to a module other than "default"
+if [ ! -z "${GOOGLE_MODULE}" ]; then
+  echo "module: ${GOOGLE_MODULE}" >> ${DRUPAL_DIR}/app.yaml
+fi
+
+# Set a version ID if none was supplied
+if [ -z "${GOOGLE_VERSION_ID}" ]; then
+    GOOGLE_VERSION_ID=$(date +%s)
+fi
+
+# Deploy to gcloud (try 3 times)
+attempts=0
+until [ $attempts -ge 3 ]
+do
+  gcloud preview app deploy \
+    --no-promote --quiet --stop-previous-version --force --docker-build=remote \
+    --project=${GOOGLE_PROJECT_ID} \
+    --version=${GOOGLE_VERSION_ID} \
+      && break
+  attempts=$[$attempts+1]
+  sleep 1
+done
+
+# Determine the deployed URL
+if [ -z "${GOOGLE_MODULE}" ]; then
+  VERSION_PREFIX=${GOOGLE_VERSION_ID}
+else
+  VERSION_PREFIX=${GOOGLE_VERSION_ID}-dot-${GOOGLE_MODULE}
+fi
 
 # perform the test
-curl -vf https://${GOOGLE_VERSION_ID}-dot-${GOOGLE_PROJECT_ID}.appspot.com
+curl -fs https://${VERSION_PREFIX}-dot-${GOOGLE_PROJECT_ID}.appspot.com > /dev/null

managed_vms/symfony/Dockerfile

@@ -6,4 +6,4 @@ FROM gcr.io/php-mvm-a/php-nginx:latest
 ENV DOCUMENT_ROOT /app/web
 
 # add write permissions to var directory for cache, logs, and session
-RUN chmod -R u+w /app/var
+RUN chmod -R ug+w /app/var

managed_vms/symfony/README.md

@@ -29,7 +29,7 @@ directory:
 # clone this repo somewhere
 git clone https://github.com/GoogleCloudPlatform/php-docs-samples /path/to/php-docs-samples
 
-# copy the four files below to the root directory of your Drupal project
+# copy the four files below to the root directory of your Symfony project
 cd /path/to/php-docs-samples/managed_vms/symfony/
 cp ./{app.yaml,php.ini,Dockerfile,nginx-app.conf} /path/to/symfony
 ```
@@ -39,7 +39,7 @@ The four files needed are as follows:
   1. [`app.yaml`](app.yaml) - The App Engine configuration for your project
   1. [`Dockerfile`](Dockerfile) - Container configuration for the PHP runtime
   1. [`php.ini`](php.ini) - Optional ini used to extend the runtime configuration.
-  1. [`nginx-app.conf`](nginx-app.conf) - Nginx web server configuration needed for `Drupal 8`
+  1. [`nginx-app.conf`](nginx-app.conf) - Nginx web server configuration needed for `Symfony`
 
 [1]: https://cloud.google.com/appengine/docs/managed-vms/
 [2]: https://console.cloud.google.com

managed_vms/symfony/tests/run-tests.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -e
+set -o xtrace
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 SAMPLE_DIR="${DIR}/.."
@@ -42,28 +43,45 @@ sed -i -e "s/database_name: .*/database_name: ${SYMFONY_DATABASE_NAME}/" $PARAME
 sed -i -e "s/database_user: .*/database_user: ${SYMFONY_DATABASE_USER}/" $PARAMETERS_FILE
 sed -i -e "s/database_password: .*/database_password: ${SYMFONY_DATABASE_PASS}/" $PARAMETERS_FILE
 
-## Perform steps outlined in the README ##
-
-# Copy configuration files to user home directory:
-cp "${SAMPLE_DIR}/app.yaml" "${SYMFONY_DIR}/app.yaml"
-cp "${SAMPLE_DIR}/nginx-app.conf" "${SYMFONY_DIR}/nginx-app.conf"
-cp "${SAMPLE_DIR}/Dockerfile" "${SYMFONY_DIR}/Dockerfile"
-cp "${SAMPLE_DIR}/php.ini" "${SYMFONY_DIR}/php.ini"
-
 cd $SYMFONY_DIR
 
-# remove composer.json - this is causing problems right now
+# Remove composer.json - this is causing problems right now
 rm composer.json
 
-# Deploy to gcloud
+## Perform steps outlined in the README ##
+
+# Copy configuration files to the symfony project
+cp $SAMPLE_DIR/{app.yaml,php.ini,Dockerfile,nginx-app.conf} $SYMFONY_DIR
+
+# Deploy to a module other than "default"
+if [ ! -z "${GOOGLE_MODULE}" ]; then
+  echo "module: ${GOOGLE_MODULE}" >> ${SYMFONY_DIR}/app.yaml
+fi
+
+# Set a version ID if none was supplied
 if [ -z "${GOOGLE_VERSION_ID}" ]; then
     GOOGLE_VERSION_ID=$(date +%s)
 fi
 
-gcloud preview app deploy \
-  --no-promote --quiet --stop-previous-version --force --docker-build=remote \
-  --project=${GOOGLE_PROJECT_ID} \
-  --version=${GOOGLE_VERSION_ID}
+# Deploy to gcloud (try 3 times)
+attempts=0
+until [ $attempts -ge 3 ]
+do
+  gcloud preview app deploy \
+    --no-promote --quiet --stop-previous-version --force --docker-build=remote \
+    --project=${GOOGLE_PROJECT_ID} \
+    --version=${GOOGLE_VERSION_ID} \
+      && break
+  attempts=$[$attempts+1]
+  sleep 1
+done
+
+# Determine the deployed URL
+if [ -z "${GOOGLE_MODULE}" ]; then
+  VERSION_PREFIX=${GOOGLE_VERSION_ID}
+else
+  VERSION_PREFIX=${GOOGLE_VERSION_ID}-dot-${GOOGLE_MODULE}
+fi
 
 # perform the test
-curl -fs https://${GOOGLE_VERSION_ID}-dot-${GOOGLE_PROJECT_ID}.appspot.com > /dev/null
+curl -fs https://${VERSION_PREFIX}-dot-${GOOGLE_PROJECT_ID}.appspot.com > /dev/null