Skip to content

Commit

Permalink
[TASK] Add PHP 7.3 to bamboo core v8 testing
Browse files Browse the repository at this point in the history 
Change-Id: I84575fb973027c184ac2f9a65d227adc38d57d07
Resolves: #86812
Releases: 8.7
Reviewed-on: https://review.typo3.org/58808
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
  • Loading branch information
@lolli42 @wouter90
lolli42 authored and wouter90 committed Oct 31, 2018
1 parent 50a1bf7 commit 64fb715
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
10 changes: 10 additions & 0 deletions Build/bamboo/src/main/java/core/NightlySpec.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,13 @@ Plan createPlan() {
jobsMainStage.add(this.getJobComposerValidate("PHP72"));

jobsMainStage.add(this.getJobAcceptanceTestInstallMysql("PHP72"));
jobsMainStage.add(this.getJobAcceptanceTestInstallMysql("PHP73"));

jobsMainStage.add(this.getJobAcceptanceTestInstallPgsql("PHP72"));
jobsMainStage.add(this.getJobAcceptanceTestInstallPgsql("PHP73"));

jobsMainStage.addAll(this.getJobsAcceptanceTestsBackendMysql(this.numberOfAcceptanceTestJobs, "PHP72"));
jobsMainStage.addAll(this.getJobsAcceptanceTestsBackendMysql(this.numberOfAcceptanceTestJobs, "PHP73"));

jobsMainStage.add(this.getJobCglCheckFullCore("PHP72"));

Expand All @@ -83,30 +86,37 @@ Plan createPlan() {
jobsMainStage.addAll(this.getJobsFunctionalTestsMysql(this.numberOfFunctionalMysqlJobs, "PHP70"));
jobsMainStage.addAll(this.getJobsFunctionalTestsMysql(this.numberOfFunctionalMysqlJobs, "PHP71"));
jobsMainStage.addAll(this.getJobsFunctionalTestsMysql(this.numberOfFunctionalMysqlJobs, "PHP72"));
jobsMainStage.addAll(this.getJobsFunctionalTestsMysql(this.numberOfFunctionalMysqlJobs, "PHP73"));

jobsMainStage.addAll(this.getJobsFunctionalTestsMssql(this.numberOfFunctionalMssqlJobs, "PHP70"));
jobsMainStage.addAll(this.getJobsFunctionalTestsMssql(this.numberOfFunctionalMssqlJobs, "PHP71"));
jobsMainStage.addAll(this.getJobsFunctionalTestsMssql(this.numberOfFunctionalMssqlJobs, "PHP72"));
// no mssql with php 7.3 yet
// jobsMainStage.addAll(this.getJobsFunctionalTestsMssql(this.numberOfFunctionalMssqlJobs, "PHP73"));

jobsMainStage.addAll(this.getJobsFunctionalTestsPgsql(this.numberOfFunctionalPgsqlJobs, "PHP70"));
jobsMainStage.addAll(this.getJobsFunctionalTestsPgsql(this.numberOfFunctionalPgsqlJobs, "PHP71"));
jobsMainStage.addAll(this.getJobsFunctionalTestsPgsql(this.numberOfFunctionalPgsqlJobs, "PHP72"));
jobsMainStage.addAll(this.getJobsFunctionalTestsPgsql(this.numberOfFunctionalPgsqlJobs, "PHP73"));

jobsMainStage.add(this.getJobUnitJavaScript("PHP72"));

jobsMainStage.add(this.getJobLintPhp("PHP70"));
jobsMainStage.add(this.getJobLintPhp("PHP71"));
jobsMainStage.add(this.getJobLintPhp("PHP72"));
jobsMainStage.add(this.getJobLintPhp("PHP73"));

jobsMainStage.add(this.getJobLintScssTs("PHP72"));

jobsMainStage.add(this.getJobUnitPhp("PHP70"));
jobsMainStage.add(this.getJobUnitPhp("PHP71"));
jobsMainStage.add(this.getJobUnitPhp("PHP72"));
jobsMainStage.add(this.getJobUnitPhp("PHP73"));

jobsMainStage.addAll(this.getJobUnitPhpRandom(this.numberOfUnitRandomOrderJobs, "PHP70"));
jobsMainStage.addAll(this.getJobUnitPhpRandom(this.numberOfUnitRandomOrderJobs, "PHP71"));
jobsMainStage.addAll(this.getJobUnitPhpRandom(this.numberOfUnitRandomOrderJobs, "PHP72"));
jobsMainStage.addAll(this.getJobUnitPhpRandom(this.numberOfUnitRandomOrderJobs, "PHP73"));

Stage stageMainStage = new Stage("Main stage")
.jobs(jobsMainStage.toArray(new Job[jobsMainStage.size()]));
Expand Down
11 changes: 7 additions & 4 deletions Build/bamboo/src/main/java/core/PreMergeSpec.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,33 +89,36 @@ Plan createPlan() {
// MAIN stage
ArrayList<Job> jobsMainStage = new ArrayList<Job>();

jobsMainStage.add(this.getJobAcceptanceTestInstallMysql("PHP72"));
jobsMainStage.add(this.getJobAcceptanceTestInstallMysql("PHP73"));
jobsMainStage.add(this.getJobAcceptanceTestInstallPgsql("PHP72"));

jobsMainStage.addAll(this.getJobsAcceptanceTestsBackendMysql(this.numberOfAcceptanceTestJobs, "PHP72"));

jobsMainStage.add(this.getJobIntegrationVarious("PHP72"));

jobsMainStage.addAll(this.getJobsFunctionalTestsMysql(this.numberOfFunctionalMysqlJobs, "PHP70"));
jobsMainStage.addAll(this.getJobsFunctionalTestsMysql(this.numberOfFunctionalMysqlJobs, "PHP73"));
// mssql functionals are not executed as pre-merge
// jobsMainStage.addAll(this.getJobsFunctionalTestsMssql(this.numberOfFunctionalMssqlJobs, "PHP71"));
jobsMainStage.addAll(this.getJobsFunctionalTestsPgsql(this.numberOfFunctionalPgsqlJobs, "PHP72"));
// jobsMainStage.addAll(this.getJobsFunctionalTestsMssql(this.numberOfFunctionalMssqlJobs, "PHP72"));
jobsMainStage.addAll(this.getJobsFunctionalTestsPgsql(this.numberOfFunctionalPgsqlJobs, "PHP70"));

jobsMainStage.add(this.getJobUnitJavaScript("PHP72"));

jobsMainStage.add(this.getJobLintPhp("PHP70"));
jobsMainStage.add(this.getJobLintPhp("PHP71"));
jobsMainStage.add(this.getJobLintPhp("PHP72"));
jobsMainStage.add(this.getJobLintPhp("PHP73"));

jobsMainStage.add(this.getJobLintScssTs("PHP72"));

jobsMainStage.add(this.getJobUnitPhp("PHP70"));
jobsMainStage.add(this.getJobUnitPhp("PHP71"));
jobsMainStage.add(this.getJobUnitPhp("PHP72"));
jobsMainStage.add(this.getJobUnitPhp("PHP73"));

jobsMainStage.addAll(this.getJobUnitPhpRandom(this.numberOfUnitRandomOrderJobs, "PHP70"));
jobsMainStage.addAll(this.getJobUnitPhpRandom(this.numberOfUnitRandomOrderJobs, "PHP71"));
jobsMainStage.addAll(this.getJobUnitPhpRandom(this.numberOfUnitRandomOrderJobs, "PHP72"));
jobsMainStage.addAll(this.getJobUnitPhpRandom(this.numberOfUnitRandomOrderJobs, "PHP73"));

Stage stageMainStage = new Stage("Main stage")
.jobs(jobsMainStage.toArray(new Job[jobsMainStage.size()]));
Expand Down

0 comments on commit 64fb715

Please sign in to comment.