diff --git a/Build/bamboo/src/main/java/core/PreMergeSpec.java b/Build/bamboo/src/main/java/core/PreMergeSpec.java index b33d2e02a031de6e7b04010a2d8ca86a918cd8d1..6505aaf1375646379166c50673e10ee663ba91f9 100644 --- a/Build/bamboo/src/main/java/core/PreMergeSpec.java +++ b/Build/bamboo/src/main/java/core/PreMergeSpec.java @@ -68,30 +68,17 @@ public class PreMergeSpec extends AbstractCoreSpec { ArrayList<Job> jobsPreparationStage = new ArrayList<Job>(); // Label task - Job jobLabel = new Job("Create build labels", new BambooKey("CLFB")) + jobsPreparationStage.add(new Job("Create build labels", new BambooKey("CLFB")) .description("Create changeId and patch set labels from variable access and parsing result of a dummy task") .tasks( new ScriptTask() .interpreter(ScriptTaskProperties.Interpreter.BINSH_OR_CMDEXE) .inlineBody("echo \"I'm just here for the labels!\"") - ); - jobsPreparationStage.add(jobLabel); - - jobsPreparationStage.add(this.getJobComposerValidate()); - - Stage stagePreparation = new Stage("Preparation") - .jobs(jobsPreparationStage.toArray(new Job[jobsPreparationStage.size()])); - - - // MAIN stage - ArrayList<Job> jobsMainStage = new ArrayList<Job>(); - - jobsMainStage.add(this.getJobAcceptanceTestInstallMysql(this.getRequirementPhpVersion70Or71(), "PHP7071")); - - jobsMainStage.addAll(this.getJobsAcceptanceTestsMysql(this.numberOfAcceptanceTestJobs, this.getRequirementPhpVersion70Or71(), "PHP7071")); + ) + ); // CGL check last commit - jobsMainStage.add(new Job("Integration CGL", new BambooKey("CGLCHECK")) + jobsPreparationStage.add(new Job("Integration CGL", new BambooKey("CGLCHECK")) .description("Check coding guidelines by executing Build/Scripts/cglFixMyCommit.sh script") .tasks( this.getTaskGitCloneRepository(), @@ -112,6 +99,19 @@ public class PreMergeSpec extends AbstractCoreSpec { ) ); + jobsPreparationStage.add(this.getJobComposerValidate()); + + Stage stagePreparation = new Stage("Preparation") + .jobs(jobsPreparationStage.toArray(new Job[jobsPreparationStage.size()])); + + + // MAIN stage + ArrayList<Job> jobsMainStage = new ArrayList<Job>(); + + jobsMainStage.add(this.getJobAcceptanceTestInstallMysql(this.getRequirementPhpVersion70Or71(), "PHP7071")); + + jobsMainStage.addAll(this.getJobsAcceptanceTestsMysql(this.numberOfAcceptanceTestJobs, this.getRequirementPhpVersion70Or71(), "PHP7071")); + jobsMainStage.add(this.getJobIntegrationVarious()); jobsMainStage.addAll(this.getJobsFunctionalTestsMysql(this.numberOfFunctionalMysqlJobs, this.getRequirementPhpVersion70Or71(), "PHP7071"));