MAGECLOUD-4919: Ability to run ece-tools on custom github source code (#170)

Author: oshmyheliuk

images/php/7.1-cli/bin/cloud-build

@@ -7,10 +7,17 @@ set -e
 RUN_HOOKS="run-hooks"
 
 if [ "$MAGENTO_RUN_MODE" == "production" ]; then
-    echo "Cleaning directories."
+    echo "Cleaning directories:"
 
-    rm -rf $MAGENTO_ROOT/setup/*
+    if [ "$INSTALLATION_TYPE" == "composer" ]; then
+       echo "Cleaning setup directory."
+       rm -rf $MAGENTO_ROOT/setup/*
+    fi
+
+    echo "Cleaning vendor directory."
     rm -rf $MAGENTO_ROOT/vendor/*
+
+    echo "Cleaning generated directory."
     rm -rf $MAGENTO_ROOT/generated/*
 fi
 

images/php/7.2-cli/bin/cloud-build

@@ -7,10 +7,17 @@ set -e
 RUN_HOOKS="run-hooks"
 
 if [ "$MAGENTO_RUN_MODE" == "production" ]; then
-    echo "Cleaning directories."
+    echo "Cleaning directories:"
 
-    rm -rf $MAGENTO_ROOT/setup/*
+    if [ "$INSTALLATION_TYPE" == "composer" ]; then
+       echo "Cleaning setup directory."
+       rm -rf $MAGENTO_ROOT/setup/*
+    fi
+
+    echo "Cleaning vendor directory."
     rm -rf $MAGENTO_ROOT/vendor/*
+
+    echo "Cleaning generated directory."
     rm -rf $MAGENTO_ROOT/generated/*
 fi
 

images/php/7.3-cli/bin/cloud-build

@@ -7,10 +7,17 @@ set -e
 RUN_HOOKS="run-hooks"
 
 if [ "$MAGENTO_RUN_MODE" == "production" ]; then
-    echo "Cleaning directories."
+    echo "Cleaning directories:"
 
-    rm -rf $MAGENTO_ROOT/setup/*
+    if [ "$INSTALLATION_TYPE" == "composer" ]; then
+       echo "Cleaning setup directory."
+       rm -rf $MAGENTO_ROOT/setup/*
+    fi
+
+    echo "Cleaning vendor directory."
     rm -rf $MAGENTO_ROOT/vendor/*
+
+    echo "Cleaning generated directory."
     rm -rf $MAGENTO_ROOT/generated/*
 fi
 

images/php/cli/bin/cloud-build

@@ -7,10 +7,17 @@ set -e
 RUN_HOOKS="run-hooks"
 
 if [ "$MAGENTO_RUN_MODE" == "production" ]; then
-    echo "Cleaning directories."
+    echo "Cleaning directories:"
 
-    rm -rf $MAGENTO_ROOT/setup/*
+    if [ "$INSTALLATION_TYPE" == "composer" ]; then
+       echo "Cleaning setup directory."
+       rm -rf $MAGENTO_ROOT/setup/*
+    fi
+
+    echo "Cleaning vendor directory."
     rm -rf $MAGENTO_ROOT/vendor/*
+
+    echo "Cleaning generated directory."
     rm -rf $MAGENTO_ROOT/generated/*
 fi
 

src/Command/BuildCompose.php

@@ -205,6 +205,13 @@ protected function configure(): void
                 InputOption::VALUE_OPTIONAL,
                 'Cloud environment variables'
             )
+            ->addOption(
+                Source\CliSource::OPTION_INSTALLATION_TYPE,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Sets magento installation type',
+                Source\BaseSource::INSTALLATION_TYPE_COMPOSER
+            )
             ->addOption(
                 Source\CliSource::OPTION_HOST,
                 null,

src/Config/Config.php

@@ -289,6 +289,8 @@ public function getVariables(): array
             $config->set(SourceInterface::VARIABLES . '.' . 'MFTF_UTILS', 1);
         }
 
+        $config->set(SourceInterface::VARIABLES . '.INSTALLATION_TYPE', $this->get(SourceInterface::INSTALLATION_TYPE));
+
         return $config->get(SourceInterface::VARIABLES);
     }
 

src/Config/Source/BaseSource.php

@@ -17,6 +17,9 @@
  */
 class BaseSource implements SourceInterface
 {
+    public const INSTALLATION_TYPE_GIT = 'git';
+    public const INSTALLATION_TYPE_COMPOSER = 'composer';
+
     public const DEFAULT_HOST = 'magento2.docker';
     public const DEFAULT_PORT = '80';
 
@@ -46,6 +49,7 @@ public function read(): Repository
             self::CRON_ENABLED => false,
             self::CONFIG_PORT => self::DEFAULT_PORT,
             self::CONFIG_HOST => self::DEFAULT_HOST,
+            self::INSTALLATION_TYPE => self::INSTALLATION_TYPE_COMPOSER
         ]);
 
         try {

src/Config/Source/CliSource.php

@@ -30,6 +30,7 @@ class CliSource implements SourceInterface
     public const OPTION_RABBIT_MQ = 'rmq';
     public const OPTION_SELENIUM_VERSION = 'selenium-version';
     public const OPTION_SELENIUM_IMAGE = 'selenium-image';
+    public const OPTION_INSTALLATION_TYPE = 'installation-type';
 
     /**
      * State modifiers.
@@ -167,6 +168,10 @@ public function read(): Repository
             $repository->set(self::CONFIG_PORT, $port);
         }
 
+        if ($installationType = $this->input->getOption(self::OPTION_INSTALLATION_TYPE)) {
+            $repository->set(self::INSTALLATION_TYPE, $installationType);
+        }
+
         return $repository;
     }
 }

src/Config/Source/SourceInterface.php

@@ -88,6 +88,7 @@ interface SourceInterface
     public const PHP_ENABLED_EXTENSIONS = self::PHP . '.extensions.enabled';
     public const PHP_DISABLED_EXTENSIONS = self::PHP . '.extensions.disabled';
 
+    public const INSTALLATION_TYPE = 'install.type';
     /**
      * Config
      */