MCLOUD-13087:Stabilize functional tests for cloud-docker for php 8.3

Author: glo42671

src/Test/Functional/Acceptance/AbstractCest.php

@@ -12,6 +12,16 @@
  */
 abstract class AbstractCest
 {
+    /**
+     * @var boolean
+     */
+    protected $removeEs = true;
+
+    /**
+     * @var boolean
+    */
+    protected $runComposerUpdate = true;
+
     /**
      * Template version for testing
      */
@@ -42,24 +52,31 @@ public function _before(\CliTester $I): void
             'magento/ece-tools',
             $I->getDependencyVersion('magento/ece-tools') ?: 'dev-develop as 2002.1.99'
         );
-
+        
         if ($mccVersion = $I->getDependencyVersion('magento/magento-cloud-components')) {
             $I->addCloudComponentsGitRepoToComposer();
+            echo "=======mccVersion==========".$mccVersion;
             $I->addDependencyToComposer('magento/magento-cloud-components', $mccVersion);
         }
 
         if ($mcpVersion = $I->getDependencyVersion('magento/magento-cloud-patches')) {
             $I->addCloudPatchesGitRepoToComposer();
+            echo "=======mcpVersion==========".$mcpVersion;
             $I->addDependencyToComposer('magento/magento-cloud-patches', $mcpVersion);
         }
 
         if ($mqpVersion = $I->getDependencyVersion('magento/quality-patches')) {
             $I->addQualityPatchesGitRepoToComposer();
+            echo "=======mqpVersion==========".$mqpVersion;
             $I->addDependencyToComposer('magento/quality-patches', $mqpVersion);
         }
-
-        $I->assertTrue($I->composerUpdate(), 'Composer update failed');
-        $I->cacheWorkDir(static::TEMPLATE_VERSION);
+        
+        if ($this->runComposerUpdate) {
+            $I->assertTrue($I->composerUpdate(), 'Composer update failed');
+            $I->cacheWorkDir(static::TEMPLATE_VERSION);
+        }
+        
+        $this->removeESIfExists($I, static::TEMPLATE_VERSION);
     }
 
     /**

src/Test/Functional/Acceptance/AcceptanceCest.php

@@ -17,7 +17,7 @@ class AcceptanceCest extends AbstractCest
     /**
      * Template version for testing
      */
-    protected const TEMPLATE_VERSION = '2.4.7-beta-test';
+    protected const TEMPLATE_VERSION = '2.4.7';
 
     /**
      * @param \CliTester $I

src/Test/Functional/Acceptance/DeveloperCest.php

@@ -17,7 +17,7 @@ class DeveloperCest extends AbstractCest
     /**
      * Template version for testing
      */
-    protected const TEMPLATE_VERSION = '2.4.7-beta-test';
+    protected const TEMPLATE_VERSION = '2.4.7';
 
     /**
      * Tests that php settings contains configuration from php.dev.ini

src/Test/Functional/Acceptance/ElasticsearchCest.php

@@ -19,7 +19,7 @@ class ElasticsearchCest extends AbstractCest
     /**
      * Template version for testing
      */
-    protected const TEMPLATE_VERSION = '2.4.7-beta-test';
+    protected const TEMPLATE_VERSION = '2.4.7';
 
     /**
      * @param CliTester $I

src/Test/Functional/Acceptance/MailHogCest.php

@@ -15,7 +15,7 @@ class MailHogCest extends AbstractCest
     /**
      * Template version for testing
      */
-    protected const TEMPLATE_VERSION = '2.4.7-beta-test';
+    protected const TEMPLATE_VERSION = '2.4.7';
 
     /**
      * @param \CliTester $I

src/Test/Functional/Acceptance/OpensearchCest.php

@@ -19,7 +19,7 @@ class OpensearchCest extends AbstractCest
     /**
      * Template version for testing
      */
-    protected const TEMPLATE_VERSION = '2.4.7-beta-test';
+    protected const TEMPLATE_VERSION = '2.4.7';
 
     /**
      * @param CliTester $I