diff --git a/Build/bamboo/src/main/java/core/AbstractCoreSpec.java b/Build/bamboo/src/main/java/core/AbstractCoreSpec.java index f2cf0538f0430e208d755eb475a9d1b45a044748..332d08f6cf0480f9fd676c120cc080518e24589b 100644 --- a/Build/bamboo/src/main/java/core/AbstractCoreSpec.java +++ b/Build/bamboo/src/main/java/core/AbstractCoreSpec.java @@ -624,6 +624,39 @@ abstract public class AbstractCoreSpec { .cleanWorkingDirectory(true); } + /** + * Job for unit testing deprecated PHP + * + * @param Requirement requirement + * @param String requirementIdentfier + */ + protected Job getJobUnitDeprecatedPhp(Requirement requirement, String requirementIdentifier) { + return new Job("Unit deprecated " + requirementIdentifier, new BambooKey("UTD" + requirementIdentifier)) + .description("Run deprecated unit tests " + requirementIdentifier) + .pluginConfigurations(this.getDefaultJobPluginConfiguration()) + .tasks( + this.getTaskGitCloneRepository(), + this.getTaskGitCherryPick(), + this.getTaskComposerInstall(), + new ScriptTask() + .description("Run phpunit") + .interpreter(ScriptTaskProperties.Interpreter.BINSH_OR_CMDEXE) + .inlineBody( + this.getScriptTaskBashInlineBody() + + this.getScriptTaskBashPhpNoXdebug() + + "php_no_xdebug bin/phpunit --log-junit test-reports/phpunit.xml -c " + this.testingFrameworkBuildPath + "UnitTestsDeprecated.xml" + ) + ) + .finalTasks( + new TestParserTask(TestParserTaskProperties.TestType.JUNIT) + .resultDirectories("test-reports/phpunit.xml") + ) + .requirements( + requirement + ) + .cleanWorkingDirectory(true); + } + /** * Jobs for unit testing PHP in random test order * diff --git a/Build/bamboo/src/main/java/core/NightlySpec.java b/Build/bamboo/src/main/java/core/NightlySpec.java index b1369d81d353d521cf25c1e5573c66bc19527058..196d08d7ef1b7064bde8f32472c00c94389e3665 100644 --- a/Build/bamboo/src/main/java/core/NightlySpec.java +++ b/Build/bamboo/src/main/java/core/NightlySpec.java @@ -109,6 +109,9 @@ public class NightlySpec extends AbstractCoreSpec { jobsMainStage.add(this.getJobUnitPhp(this.getRequirementPhpVersion70(), "PHP70")); jobsMainStage.add(this.getJobUnitPhp(this.getRequirementPhpVersion71(), "PHP71")); + jobsMainStage.add(this.getJobUnitDeprecatedPhp(this.getRequirementPhpVersion70(), "PHP70")); + jobsMainStage.add(this.getJobUnitDeprecatedPhp(this.getRequirementPhpVersion71(), "PHP71")); + jobsMainStage.addAll(this.getJobUnitPhpRandom(this.numberOfUnitRandomOrderJobs, this.getRequirementPhpVersion70(), "PHP70")); jobsMainStage.addAll(this.getJobUnitPhpRandom(this.numberOfUnitRandomOrderJobs, this.getRequirementPhpVersion71(), "PHP71")); diff --git a/Build/bamboo/src/main/java/core/PreMergeSpec.java b/Build/bamboo/src/main/java/core/PreMergeSpec.java index 3b76ced74504853e8ef076ee8eeb0d5868c4b9f8..ee6db6c13d52ec53dcec7fbede587e23dbd260d0 100644 --- a/Build/bamboo/src/main/java/core/PreMergeSpec.java +++ b/Build/bamboo/src/main/java/core/PreMergeSpec.java @@ -111,6 +111,9 @@ public class PreMergeSpec extends AbstractCoreSpec { jobsMainStage.add(this.getJobUnitPhp(this.getRequirementPhpVersion70(), "PHP70")); jobsMainStage.add(this.getJobUnitPhp(this.getRequirementPhpVersion71(), "PHP71")); + jobsMainStage.add(this.getJobUnitDeprecatedPhp(this.getRequirementPhpVersion70(), "PHP70")); + jobsMainStage.add(this.getJobUnitDeprecatedPhp(this.getRequirementPhpVersion71(), "PHP71")); + jobsMainStage.addAll(this.getJobUnitPhpRandom(this.numberOfUnitRandomOrderJobs, this.getRequirementPhpVersion70(), "PHP70")); jobsMainStage.addAll(this.getJobUnitPhpRandom(this.numberOfUnitRandomOrderJobs, this.getRequirementPhpVersion71(), "PHP71"));