diff --git a/Build/gitlab-ci.yml b/Build/gitlab-ci.yml index c2986de13384..a671c6b8b374 100644 --- a/Build/gitlab-ci.yml +++ b/Build/gitlab-ci.yml @@ -50,7 +50,6 @@ image: typo3/core-testing-docker:latest stages: # Stages for pre-merge - - early - main # Stages for nightly - integrity @@ -62,7 +61,6 @@ include: # Pre-merge tests are triggered by pushing to changes to gerrit. # A push to gerrit has a change-id and a patch-set, a gerrit-gitlab-adapter # turns this into a branch 'change-patchset' which executes the pipeline - - local: 'Build/gitlab-ci/pre-merge/early.yml' - local: 'Build/gitlab-ci/pre-merge/acceptance-install.yml' - local: 'Build/gitlab-ci/pre-merge/acceptance-application.yml' - local: 'Build/gitlab-ci/pre-merge/integrity.yml' diff --git a/Build/gitlab-ci/nightly/integrity.yml b/Build/gitlab-ci/nightly/integrity.yml index c2d09a154f08..d5125c987507 100644 --- a/Build/gitlab-ci/nightly/integrity.yml +++ b/Build/gitlab-ci/nightly/integrity.yml @@ -16,14 +16,6 @@ cgl: - Build/Scripts/runTests.sh -s composerInstall -p 8.1 - Build/Scripts/runTests.sh -s cgl -n -p 8.1 -composer validate: - stage: integrity - needs: [] - only: - - schedules - script: - - Build/Scripts/runTests.sh -s composerValidate -p 8.1 - grunt clean: stage: integrity needs: [] @@ -46,6 +38,7 @@ integration various: paths: - .cache script: + - Build/Scripts/runTests.sh -s composerValidate -p 8.1 - Build/Scripts/runTests.sh -s composerTestDistribution -p 8.1 - Build/Scripts/runTests.sh -s composerInstall -p 8.1 - Build/Scripts/runTests.sh -s checkExceptionCodes -p 8.1 diff --git a/Build/gitlab-ci/pre-merge/early.yml b/Build/gitlab-ci/pre-merge/early.yml deleted file mode 100644 index 7e300ed9c642..000000000000 --- a/Build/gitlab-ci/pre-merge/early.yml +++ /dev/null @@ -1,18 +0,0 @@ -cgl pre-merge: - stage: early - except: - refs: - - schedules - - main - script: - - Build/Scripts/runTests.sh -s composerInstall -p 8.1 - - Build/Scripts/runTests.sh -s cglGit -n -p 8.1 - -composer validate pre-merge: - stage: early - except: - refs: - - schedules - - main - script: - - Build/Scripts/runTests.sh -s composerValidate -p 8.1 diff --git a/Build/gitlab-ci/pre-merge/integrity.yml b/Build/gitlab-ci/pre-merge/integrity.yml index 9d3fa113dd62..efb3b07e7864 100644 --- a/Build/gitlab-ci/pre-merge/integrity.yml +++ b/Build/gitlab-ci/pre-merge/integrity.yml @@ -8,6 +8,16 @@ annotations php 8.1 pre-merge: - Build/Scripts/runTests.sh -s composerInstall -p 8.1 - Build/Scripts/runTests.sh -s checkAnnotations -p 8.1 +cgl pre-merge: + stage: main + except: + refs: + - schedules + - main + script: + - Build/Scripts/runTests.sh -s composerInstall -p 8.1 + - Build/Scripts/runTests.sh -s cglGit -n -p 8.1 + grunt clean pre-merge: stage: main except: @@ -32,6 +42,7 @@ integration various pre-merge: paths: - .cache script: + - Build/Scripts/runTests.sh -s composerValidate -p 8.1 - Build/Scripts/runTests.sh -s composerTestDistribution -p 8.1 - Build/Scripts/runTests.sh -s composerInstall -p 8.1 - Build/Scripts/runTests.sh -s checkExceptionCodes -p 8.1