MAGECLOUD-3542: Stabilize functional tests on the Docker (#456)

Author: shiftedreality

.travis.yml

@@ -24,8 +24,6 @@ env:
 
 cache:
   apt: true
-  directories:
-    - $HOME/.composer/cache
 
 before_install:
   - echo "COMPOSER_MAGENTO_USERNAME=${REPO_USERNAME}" >> ./docker/composer.env

codeception.dist.yml

@@ -26,5 +26,10 @@ modules:
       system_magento_dir: "%Magento.docker.settings.system.magento_dir%"
       env_base_url: "%Magento.docker.settings.env.url.base%"
       env_secure_base_url: "%Magento.docker.settings.env.url.secure_base%"
+      volumes:
+        - /var/www/magento/pub/static
+        - /var/www/magento/pub/media
+        - /var/www/magento/var
+        - /var/www/magento/app/etc
     PhpBrowser:
       url: "%Magento.docker.settings.env.url.base%"

tests/functional/Codeception/Docker.php

@@ -35,6 +35,9 @@ class Docker extends Module implements BuilderAwareInterface, ContainerAwareInte
     const BUILD_CONTAINER = 'build';
     const DEPLOY_CONTAINER = 'deploy';
 
+    /**
+     * @var array
+     */
     protected $config = [
         'db_host' => '',
         'db_port' => '3306',
@@ -47,6 +50,7 @@ class Docker extends Module implements BuilderAwareInterface, ContainerAwareInte
         'system_magento_dir' => '',
         'env_base_url' => '',
         'env_secure_base_url' => '',
+        'volumes' => []
     ];
 
     /**
@@ -66,7 +70,7 @@ public function _initialize()
      */
     public function _before(TestInterface $test)
     {
-        $this->taskEnvUp()
+        $this->taskEnvUp($this->_getConfig('volumes'))
             ->run()
             ->stopOnFail();
     }

tests/functional/Robo/Tasks.php

@@ -18,11 +18,12 @@ trait Tasks
     use TaskAccessor;
 
     /**
+     * @param array $volumes
      * @return Tasks\EnvUp|CollectionBuilder
      */
-    protected function taskEnvUp(): CollectionBuilder
+    protected function taskEnvUp(array $volumes): CollectionBuilder
     {
-        return $this->task(Tasks\EnvUp::class);
+        return $this->task(Tasks\EnvUp::class, $volumes);
     }
 
     /**

tests/functional/Robo/Tasks/EnvUp.php

@@ -9,23 +9,50 @@
 
 use Robo\Common\ExecOneCommand;
 use Robo\Contract\CommandInterface;
-use Robo\Contract\TaskInterface;
 use Robo\Result;
 use Robo\Task\BaseTask;
+use Magento\MagentoCloud\Test\Functional\Codeception\Docker;
 
 /**
  * Up Docker environment
  */
-class EnvUp extends BaseTask implements CommandInterface, TaskInterface
+class EnvUp extends BaseTask implements CommandInterface
 {
     use ExecOneCommand;
 
+    /**
+     * @var array
+     */
+    private $volumes;
+
+    /**
+     * @param array $volumes
+     */
+    public function __construct(array $volumes)
+    {
+        $this->volumes = $volumes;
+    }
+
     /**
      * @inheritdoc
      */
     public function getCommand(): string
     {
-        return 'docker-compose down -v && docker-compose up -d';
+        $commands = [
+            'docker-compose down -v',
+        ];
+
+        foreach ($this->volumes as $volume) {
+            $commands[] = sprintf(
+                'docker-compose run %s bash -c "mkdir -p %s"',
+                Docker::BUILD_CONTAINER,
+                $volume
+            );
+        }
+
+        $commands[] = 'docker-compose up -d';
+
+        return implode(' && ', $commands);
     }
 
     /**