Revert "[TASK] Remove COMPOSER_ROOT_VERSION from bamboo testing" 37/59337/2
authorChristian Kuhn <lolli@schwarzbu.ch>
Sat, 5 Jan 2019 13:13:10 +0000 (14:13 +0100)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Sat, 5 Jan 2019 13:27:18 +0000 (14:27 +0100)
This reverts commit 4036d2ecf3c5cfc24fa4f0408633eac6fec72515.

The solution does not work out for not yet released
major versions like 10.*.

Reverts: #87170
Resolves: #87170
Releases: master
Change-Id: Ibb827acc97e48e5e44e4b8aec77501517afc762e
Reviewed-on: https://review.typo3.org/59337
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Build/bamboo/src/main/java/core/AbstractCoreSpec.java

index 9c477dd..cd4a158 100644 (file)
@@ -45,6 +45,8 @@ abstract public class AbstractCoreSpec {
     protected static String projectName = "TYPO3 Core";
     protected static String projectKey = "CORE";
 
+    protected String composerRootVersionEnvironment = "COMPOSER_ROOT_VERSION=10.0.0";
+
     protected String testingFrameworkBuildPath = "vendor/typo3/testing-framework/Resources/Core/Build/";
 
     /**
@@ -176,6 +178,7 @@ abstract public class AbstractCoreSpec {
                     this.getScriptTaskComposer(requirementIdentifier) +
                     "composer validate"
                 )
+                .environmentVariables(this.composerRootVersionEnvironment)
         )
         .requirements(
             this.getRequirementDocker10()
@@ -1369,7 +1372,8 @@ abstract public class AbstractCoreSpec {
                 this.getScriptTaskBashInlineBody() +
                 this.getScriptTaskComposer(requirementIdentifier) +
                 "composer install --no-progress --no-suggest --no-interaction"
-            );
+            )
+            .environmentVariables(this.composerRootVersionEnvironment);
     }
 
     /**
@@ -1392,7 +1396,8 @@ abstract public class AbstractCoreSpec {
                 this.getScriptTaskComposer(requirementIdentifier) +
                 "composer install -n\n" +
                 "composer update --with-dependencies --no-progress -n"
-            );
+            )
+            .environmentVariables(this.composerRootVersionEnvironment);
     }
 
     /**
@@ -1415,7 +1420,8 @@ abstract public class AbstractCoreSpec {
                 this.getScriptTaskComposer(requirementIdentifier) +
                 "composer install -n\n" +
                 "composer update --prefer-lowest --no-progress -n"
-            );
+            )
+            .environmentVariables(this.composerRootVersionEnvironment);
     }
 
     /**