Adds REST-specific kokoro job (GoogleCloudPlatform#925)

Author: bshaffer

.kokoro/docker/php73/Dockerfile

@@ -33,14 +33,15 @@ RUN apt-get update && \
             zlib1g-dev
 
 RUN ln -s /usr/lib/libc-client.a /usr/lib/x86_64-linux-gnu/libc-client.a && \
-    mkdir ${PHP_DIR} ${PHP_SRC_DIR} && \
+    mkdir -p ${PHP_DIR} ${PHP_SRC_DIR} ${PHP_DIR}/lib/conf.d && \
     cd ${PHP_SRC_DIR} && \
     wget http://us1.php.net/get/php-7.3.0.tar.bz2/from/this/mirror \
          -O php-7.3.0.tar.bz2 && \
     tar jxf php-7.3.0.tar.bz2 && \
     cd php-7.3.0 && \
     ./configure \
         --prefix=${PHP_DIR} \
+        --with-config-file-scan-dir=${PHP_DIR}/lib/conf.d \
         --with-pdo-pgsql \
         --with-zlib-dir \
         --with-freetype-dir \
@@ -92,7 +93,7 @@ RUN ln -s /usr/lib/libc-client.a /usr/lib/x86_64-linux-gnu/libc-client.a && \
         pecl install grpc && \
         cp php.ini-production ${PHP_DIR}/lib/php.ini && \
         echo 'zend_extension=opcache.so' >> ${PHP_DIR}/lib/php.ini && \
-        echo 'extension=grpc.so' >> ${PHP_DIR}/lib/php.ini && \
+        echo 'extension=grpc.so' >> ${PHP_DIR}/lib/conf.d/ext-grpc.ini && \
         php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
         php -r "if (hash_file('SHA384', 'composer-setup.php') === rtrim(file_get_contents('https://composer.github.io/installer.sig'))) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
         php composer-setup.php --filename=composer --install-dir=/usr/local/bin

.kokoro/php_rest.cfg

@@ -0,0 +1,13 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/php73"
+}
+
+# Set this project to run REST tests only
+env_vars: {
+    key: "RUN_REST_TESTS_ONLY"
+    value: "true"
+}

.kokoro/system_tests.sh

@@ -24,7 +24,9 @@ fi
 cd github/php-docs-samples
 
 export GOOGLE_APPLICATION_CREDENTIALS=$KOKORO_GFILE_DIR/service-account.json
-export GOOGLE_ALT_APPLICATION_CREDENTIALS=$KOKORO_GFILE_DIR/$GOOGLE_ALT_CREDENTIALS_FILENAME
+if [ -n "$GOOGLE_ALT_CREDENTIALS_FILENAME" ]; then
+  export GOOGLE_ALT_APPLICATION_CREDENTIALS=$KOKORO_GFILE_DIR/$GOOGLE_ALT_CREDENTIALS_FILENAME
+fi
 
 export PATH="$PATH:/opt/composer/vendor/bin:/root/google-cloud-sdk/bin"
 
@@ -46,7 +48,7 @@ source .kokoro/secrets.sh
 
 mkdir -p build/logs
 
-export IS_PULL_REQUEST=$KOKORO_GITHUB_PULL_REQUEST_COMMIT
+export PULL_REQUEST_NUMBER=$KOKORO_GITHUB_PULL_REQUEST_NUMBER
 
 # Run code standards check when appropriate
 if [ "${RUN_CS_CHECK}" = "true" ]; then
@@ -55,6 +57,12 @@ if [ "${RUN_CS_CHECK}" = "true" ]; then
   bash testing/run_cs_check.sh
 fi
 
+# If we are running REST tests, disable gRPC
+if [ "${RUN_REST_TESTS_ONLY}" = "true" ]; then
+  GRPC_INI=$(php -i | grep grpc.ini | sed 's/^Additional .ini files parsed => //g' | sed 's/,*$//g' )
+  mv $GRPC_INI "${GRPC_INI}.disabled"
+fi
+
 # Install global test dependencies
 bash testing/composer.sh
 

bigtable/test/bigtableTest.php

@@ -371,6 +371,8 @@ public function testDeleteTable()
 
     public function testWritingRows()
     {
+        $this->requireGrpc();
+
         $tableId = uniqid(self::TABLE_ID_PREFIX);
         $tableName = self::$tableAdminClient->tableName(self::$projectId, self::$instanceId, $tableId);
 
@@ -400,6 +402,8 @@ public function testWritingRows()
 
     public function testGettingARow()
     {
+        $this->requireGrpc();
+
         $tableId = uniqid(self::TABLE_ID_PREFIX);
         $tableName = self::$tableAdminClient->tableName(self::$projectId, self::$instanceId, $tableId);
 
@@ -426,6 +430,8 @@ public function testGettingARow()
 
     public function testScanningAllRows()
     {
+        $this->requireGrpc();
+
         $tableId = uniqid(self::TABLE_ID_PREFIX);
         $tableName = self::$tableAdminClient->tableName(self::$projectId, self::$instanceId, $tableId);
 

bigtable/test/writeTest.php

@@ -110,6 +110,8 @@ public function testWriteIncrement()
 
     public function testWriteBatch()
     {
+        $this->requireGrpc();
+
         $output = $this->runSnippet('writes/write_batch', [
             self::$projectId,
             self::$instanceId,

testing/RUN_ALL_TESTS

@@ -28,12 +28,16 @@ FLAKES=(
 
 # tests to run with grpc.so disabled
 REST_TESTS=(
+    asset
     bigquerydatatransfer
-    error_reporting
+    bigtable
     dialogflow
     dlp
+    error_reporting
+    iot
     monitoring
     video
+    vision
 )
 
 # These tests run in a different project, determined by GOOGLE_ALT_PROJECT_ID
@@ -58,8 +62,6 @@ ALT_PROJECT_TESTS=(
     vision
 )
 
-GRPC_INI=$(php -i | grep grpc.ini | sed 's/,*$//g')
-
 TMP_REPORT_DIR=$(mktemp -d)
 
 SUCCEEDED_FILE=${TMP_REPORT_DIR}/succeeded
@@ -72,11 +74,17 @@ FILES_CHANGED=$(git diff --name-only HEAD $(git merge-base HEAD master))
 
 # If the file RUN_ALL_TESTS is modified, or if we were not triggered from a Pull
 # Request, run the whole test suite.
-if grep -q ^testing\/RUN_ALL_TESTS$ <<< "$FILES_CHANGED" || \
-    [ -z "$IS_PULL_REQUEST" ]; then
+if [ -z "$PULL_REQUEST_NUMBER" ]; then
     RUN_ALL_TESTS=1
 else
-    RUN_ALL_TESTS=0
+    # Check to see if the repo includes the "kokoro:run-all" label
+    if curl "https://api.github.com/repos/GoogleCloudPlatform/php-docs-samples/issues/$PULL_REQUEST_NUMBER/labels" \
+        | grep -q "kokoro:run-all"; then
+        RUN_ALL_TESTS=1
+    else
+        RUN_ALL_TESTS=0
+    fi
+
 fi
 
 if [ "${TEST_DIRECTORIES}" = "" ]; then
@@ -118,10 +126,19 @@ do
     # Only run tests for samples that have changed.
     if [ "$RUN_ALL_TESTS" -ne "1" ]; then
         if ! grep -q ^$DIR <<< "$FILES_CHANGED" ; then
-            echo "Skipping tests in $DIR"
+            echo "Skipping tests in $DIR (unchanged)"
             continue
         fi
     fi
+    if [ "${RUN_REST_TESTS_ONLY}" = "true" ] && [[ ! "${REST_TESTS[@]}" =~ "${DIR}" ]]; then
+        echo "Skipping tests in $DIR (no REST tests)"
+        continue
+    fi
+    if [ "$RUN_DEPLOYMENT_TESTS" != "true" ] &&
+       [[ -z $(find $DIR/test/ -type f -name *Test.php -not -name Deploy*Test.php) ]]; then
+        echo "Skipping tests in $DIR (Deployment tests only)"
+        continue
+    fi
     pushd ${DIR}
     mkdir -p build/logs
     # Temporarily allowing error
@@ -133,23 +150,15 @@ do
     if [ $? != 0 ]; then
         # If the PHP required version is too low, skip the test
         if composer check-platform-reqs | grep "__root__ requires php" | grep failed ; then
-            echo "Skipping tests in $DIR"
+            echo "Skipping tests in $DIR (incompatible PHP version)"
         else
             # Run composer without "-q"
             composer install
             echo "${DIR}: failed" >> "${FAILED_FILE}"
         fi
     else
         echo "running phpunit in ${DIR}"
-        if [[ "${REST_TESTS[@]}" =~ "${DIR}" ]]; then
-            run_tests "${DIR} (grpc)"
-            # disable gRPC to test using REST only, then re-enable it
-            mv $GRPC_INI "${GRPC_INI}.disabled"
-            run_tests "${DIR} (rest)"
-            mv "${GRPC_INI}.disabled" $GRPC_INI
-        else
-            run_tests $DIR
-        fi
+        run_tests $DIR
         set -e
         if [ "$RUN_ALL_TESTS" -eq "1" ] && [ -f build/logs/clover.xml ]; then
             cp build/logs/clover.xml \