diff --git a/Build/bamboo/src/main/java/core/AbstractCoreSpec.java b/Build/bamboo/src/main/java/core/AbstractCoreSpec.java index 69d293f940a6fd60e974a54fc6a14ed1b5640f8b..535ca6ef17c07b91114463b06e81dd879af45450 100644 --- a/Build/bamboo/src/main/java/core/AbstractCoreSpec.java +++ b/Build/bamboo/src/main/java/core/AbstractCoreSpec.java @@ -387,6 +387,15 @@ abstract public class AbstractCoreSpec { .matchType(Requirement.MatchType.EQUALS); } + /** + * Requirement for php 7.2 + */ + protected Requirement getRequirementPhpVersion72() { + return new Requirement("system.phpVersion") + .matchValue("7.2") + .matchType(Requirement.MatchType.EQUALS); + } + /** * A bash header for script tasks forking a bash if needed */ diff --git a/Build/bamboo/src/main/java/core/PreMergeSpec.java b/Build/bamboo/src/main/java/core/PreMergeSpec.java index 75137ceb0923e4804123700a35531f4f4792ed58..08e80b9d7a7980c3a8ce93644fdac501c1fdcf04 100644 --- a/Build/bamboo/src/main/java/core/PreMergeSpec.java +++ b/Build/bamboo/src/main/java/core/PreMergeSpec.java @@ -87,16 +87,19 @@ public class PreMergeSpec extends AbstractCoreSpec { jobsMainStage.addAll(this.getJobsFunctionalTestsMysql(this.numberOfFunctionalMysqlJobs, this.getRequirementPhpVersion56(), "PHP56")); jobsMainStage.addAll(this.getJobsFunctionalTestsMysql(this.numberOfFunctionalMysqlJobs, this.getRequirementPhpVersion70(), "PHP70")); jobsMainStage.addAll(this.getJobsFunctionalTestsMysql(this.numberOfFunctionalMysqlJobs, this.getRequirementPhpVersion71(), "PHP71")); + jobsMainStage.addAll(this.getJobsFunctionalTestsMysql(this.numberOfFunctionalMysqlJobs, this.getRequirementPhpVersion72(), "PHP72")); jobsMainStage.add(this.getJobLintPhp(this.getRequirementPhpVersion55(), "PHP55")); jobsMainStage.add(this.getJobLintPhp(this.getRequirementPhpVersion56(), "PHP56")); jobsMainStage.add(this.getJobLintPhp(this.getRequirementPhpVersion70(), "PHP70")); jobsMainStage.add(this.getJobLintPhp(this.getRequirementPhpVersion71(), "PHP71")); + jobsMainStage.add(this.getJobLintPhp(this.getRequirementPhpVersion72(), "PHP72")); jobsMainStage.add(this.getJobUnitPhp(this.getRequirementPhpVersion55(), "PHP55")); jobsMainStage.add(this.getJobUnitPhp(this.getRequirementPhpVersion56(), "PHP56")); jobsMainStage.add(this.getJobUnitPhp(this.getRequirementPhpVersion70(), "PHP70")); jobsMainStage.add(this.getJobUnitPhp(this.getRequirementPhpVersion71(), "PHP71")); + jobsMainStage.add(this.getJobUnitPhp(this.getRequirementPhpVersion72(), "PHP72")); Stage stageMainStage = new Stage("Main stage") .jobs(jobsMainStage.toArray(new Job[jobsMainStage.size()]));