From 950df8181e6c651998a4e19dba347a3f1fd4d287 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Tue, 20 Jun 2017 18:48:10 +0200
Subject: [PATCH] [TASK] bamboo: Allow mssql+postgres builds on both php 7.0 &
7.1
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>
---
.../bamboo/src/main/java/core/PreMergeSpec.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Build/bamboo/src/main/java/core/PreMergeSpec.java b/Build/bamboo/src/main/java/core/PreMergeSpec.java
index 3809da1ea664..22e46da6def4 100644
--- a/Build/bamboo/src/main/java/core/PreMergeSpec.java
+++ b/Build/bamboo/src/main/java/core/PreMergeSpec.java
@@ -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);
}
--
GitLab