Fixes Kokoro Tests (GoogleCloudPlatform#714)

Author: bshaffer

.gitignore

@@ -2,11 +2,11 @@
 *~
 *.iml
 composer.phar
+composer.lock
 vendor/
 credentials.*
 **/vendor/
 **/build/
 .php_cs.cache
 .vscode/
-iap/composer.lock
 .kokoro/secrets.sh

.kokoro/docker/Dockerfile.template

@@ -38,4 +38,3 @@ RUN gcloud config set app/promote_by_default false && \
     gcloud -q components update
 
 ENTRYPOINT /bin/bash
-

.kokoro/docker/Makefile

@@ -11,13 +11,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 .PHONY: all build push php56 php70 php71 php72
+
+all:
+	make build
+	make push
+
 php56:
 	mkdir -p php56
 	sed -e 's/PHP_VERSION/php56/g' Dockerfile.template > php56/Dockerfile
 	echo "# Add steps specific to PHP 5.6" >> php56/Dockerfile
-	echo "RUN apt-get install -y php5-cgi" >> php56/Dockerfile
 	echo "RUN rm /opt/php56/lib/ext.enabled/ext-memcached.ini" >> php56/Dockerfile
-	echo "ENV RUN_DEVSERVER_TESTS=true" >> php56/Dockerfile
 	echo "ENV RUN_CS_FIXER=true\n" >> php56/Dockerfile
 
 php70:
@@ -43,7 +46,3 @@ push:
 	docker push gcr.io/cloud-devrel-kokoro-resources/php70
 	docker push gcr.io/cloud-devrel-kokoro-resources/php71
 	docker push gcr.io/cloud-devrel-kokoro-resources/php72
-
-all:
-	make build
-	make push

.kokoro/php56.cfg

@@ -5,3 +5,9 @@ env_vars: {
     key: "TRAMPOLINE_IMAGE"
     value: "gcr.io/cloud-devrel-kokoro-resources/php56"
 }
+
+# Give the docker image a unique project ID per PHP version
+env_vars: {
+    key: "GOOGLE_ALT_PROJECT_ID"
+    value: "php-docs-samples-php56"
+}

.kokoro/php70.cfg

@@ -5,3 +5,9 @@ env_vars: {
     key: "TRAMPOLINE_IMAGE"
     value: "gcr.io/cloud-devrel-kokoro-resources/php70"
 }
+
+# Give the docker image a unique project ID per PHP version
+env_vars: {
+    key: "GOOGLE_ALT_PROJECT_ID"
+    value: "php-docs-samples-php70"
+}

.kokoro/php71.cfg

@@ -5,3 +5,9 @@ env_vars: {
     key: "TRAMPOLINE_IMAGE"
     value: "gcr.io/cloud-devrel-kokoro-resources/php71"
 }
+
+# Give the docker image a unique project ID per PHP version
+env_vars: {
+    key: "GOOGLE_ALT_PROJECT_ID"
+    value: "php-docs-samples-php71"
+}

.kokoro/php72.cfg

@@ -5,3 +5,9 @@ env_vars: {
     key: "TRAMPOLINE_IMAGE"
     value: "gcr.io/cloud-devrel-kokoro-resources/php72"
 }
+
+# Give the docker image a unique project ID per PHP version
+env_vars: {
+    key: "GOOGLE_ALT_PROJECT_ID"
+    value: "php-docs-samples-php72"
+}

.kokoro/secrets-example.sh

@@ -16,6 +16,8 @@ export GOOGLE_STORAGE_BUCKET=$GOOGLE_PROJECT_ID
 export GOOGLE_CLIENT_ID=
 export GOOGLE_CLIENT_SECRET=
 export GCLOUD_PROJECT=$GOOGLE_PROJECT_ID
+# For running tests in separate projects
+export GOOGLE_ALT_PROJECT_ID=$GOOGLE_PROJECT_ID
 
 # AppEngine
 export MAILJET_APIKEY=
@@ -96,6 +98,7 @@ export GOOGLE_SPANNER_DATABASE_ID=test-database
 # Storage
 export GOOGLE_STORAGE_OBJECT=storage/test_data.csv
 export GOOGLE_STORAGE_KMS_KEYNAME=projects/$GOOGLE_PROJECT_ID/locations/us/keyRings/$GOOGLE_KMS_KEYRING/cryptoKeys/storage-bucket
+export GOOGLE_REQUESTER_PAYS_STORAGE_BUCKET=$GOOGLE_STORAGE_BUCKET
 
 # Tasks
 export CLOUD_TASKS_APPENGINE_QUEUE=