[TASK] bamboo: Allow mssql+postgres builds on both php 7.0 & 7.1 92/53292/2
authorChristian Kuhn <lolli@schwarzbu.ch>
Tue, 20 Jun 2017 16:48:10 +0000 (18:48 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Tue, 20 Jun 2017 17:03:59 +0000 (19:03 +0200)
Change-Id: I240ed28992cea31e04aa7451ef609c68eade7782
Resolves: #81635
Releases: master
Reviewed-on: https://review.typo3.org/53292
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Build/bamboo/src/main/java/core/PreMergeSpec.java

index 3809da1..22e46da 100644 (file)
@@ -292,9 +292,9 @@ public class PreMergeSpec {
             jobsMainStage.add(jobFunctionalMysql);
         }
 
-        // Functional tests mssql php70
+        // Functional tests mssql php70 or php71
         for (int i=0; i<this.numberOfFunctionalMssqlJobs; i++) {
-            Job jobFunctionalMssql = new Job("Func mssql php70 0" + i, new BambooKey("FMS0" + i))
+            Job jobFunctionalMssql = new Job("Func mssql 0" + i, new BambooKey("FMS0" + i))
                 .description("Run functional tests on mssql DB")
                 .tasks(
                     this.getTaskGitCloneRepository(),
@@ -317,15 +317,15 @@ public class PreMergeSpec {
                 )
                 .requirements(
                     new Requirement("system.phpVersion")
-                        .matchValue("7.0")
-                        .matchType(Requirement.MatchType.EQUALS)
+                        .matchValue("7\\.0|7\\.1")
+                        .matchType(Requirement.MatchType.MATCHES)
                 );
             jobsMainStage.add(jobFunctionalMssql);
         }
 
-        // Functional tests postgres php71
+        // Functional tests postgres php70 or php71
         for (int i=0; i<this.numberOfFunctionalPgsqlJobs; i++) {
-            Job jobFunctionalPgsql = new Job("Func pgsql php71 0" + i, new BambooKey("FPG0" + i))
+            Job jobFunctionalPgsql = new Job("Func pgsql 0" + i, new BambooKey("FPG0" + i))
                 .description("Run functional tests on pgsql DB")
                 .tasks(
                     this.getTaskGitCloneRepository(),
@@ -348,8 +348,8 @@ public class PreMergeSpec {
                 )
                 .requirements(
                     new Requirement("system.phpVersion")
-                        .matchValue("7.1")
-                        .matchType(Requirement.MatchType.EQUALS)
+                    .matchValue("7\\.0|7\\.1")
+                    .matchType(Requirement.MatchType.MATCHES)
                 );
             jobsMainStage.add(jobFunctionalPgsql);
         }