Use gcloud preview app versions for cleaning up.

Author: Takashi Matsuo

appengine/standard/phpmyadmin/composer.lock

@@ -157,19 +157,21 @@ public static function deploy($project_id, $e2e_test_version, $target)
 
     public static function tearDownAfterClass()
     {
-        $command = 'gcloud -q preview app modules delete phpmyadmin --version '
+        $command = 'gcloud -q preview app versions delete --service phpmyadmin '
             . getenv(self::VERSION_ENV)
             . ' --project '
             . getenv(self::PROJECT_ENV);
-        exec($command, $output, $ret);
-        foreach ($output as $line) {
-            self::output($line);
-        }
-        if ($ret === 0) {
-            self::output('Successfully delete the version');
-            return;
-        } else {
-            self::output('Retrying to delete the version');
+        for ($i = 0; $i <= 3; $i++) {
+            exec($command, $output, $ret);
+            foreach ($output as $line) {
+                self::output($line);
+            }
+            if ($ret === 0) {
+                self::output('Successfully delete the version');
+                return;
+            } else {
+                self::output('Retrying to delete the version');
+            }
         }
         self::fail('Failed to delete the version.');
     }

appengine/standard/phpmyadmin/tests/DeployTest.php

@@ -95,7 +95,7 @@ public static function deploy($project_id, $e2e_test_version)
     public static function tearDownAfterClass()
     {
         for ($i = 0; $i <= 3; $i++) {
-            exec('gcloud -q preview app modules delete default --version '
+            exec('gcloud -q preview app versions delete --service default '
                  . self::getVersion()
                  . ' --project '
                  . getenv(self::PROJECT_ENV),

appengine/wordpress/tests/FlexTest.php

@@ -95,7 +95,7 @@ public static function deploy($project_id, $e2e_test_version)
     public static function tearDownAfterClass()
     {
         for ($i = 0; $i <= 3; $i++) {
-            exec('gcloud -q preview app modules delete default --version '
+            exec('gcloud -q preview app versions delete --service default '
                  . self::getVersion()
                  . ' --project '
                  . getenv(self::PROJECT_ENV),

appengine/wordpress/tests/StdTest.php

@@ -172,17 +172,18 @@ public function stop()
     /**
      * Deletes the deployed app.
      *
-     * @param string $module
+     * @param string $service
      * @param int $retry optional number of retries upon failure
      *
      * @return bool true if the app is succesfully deleted, otherwise false
      */
     public function delete(
-        $module = 'default',
+        $service = 'default',
         $retry = self::DEFAULT_RETRY
     ) {
-        $cmd = "gcloud -q " . self::GCLOUD_APP . " modules delete $module "
-            . "--version " . $this->version . " --project " . $this->project;
+        $cmd = "gcloud -q " . self::GCLOUD_APP . " versions delete "
+            . "--service " . $service . " "
+            . $this->version . " --project " . $this->project;
         $ret = $this->execWithRetry($cmd, $retry);
         return $ret;
     }

testing/GaeApp.php

@@ -45,8 +45,9 @@ configure_gcloud()
     fi
     gcloud -q components install app-engine-python
     gcloud -q components install app-engine-php
-    # pinning to 104.0.0 because 105.0.0 is broken for php app
-    gcloud -q components update --version 104.0.0
+    gcloud -q components update --version 106.0.0
+    # Use gsutil for deploying appengine std apps.
+    gcloud config set app/use_gsutil true
 }
 
 install_php_cs_fixer()