Commit 279e41b7 authored by Anja Leichsenring's avatar Anja Leichsenring Committed by Christian Kuhn
Browse files

[TASK] Default retry for GitlabCI test jobs

Each jobs will have one more run in case it fails in the first.
This will prevent pipeline failures due to recoverable test
run failures.

Resolves: #93603
Releases: master, 10.4, 9.5
Change-Id: Ia054973d1f2a336727ef9d483041f1f48147c375
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/68145

Tested-by: default avatarTYPO3com <noreply@typo3.com>
Tested-by: core-ci's avatarcore-ci <typo3@b13.com>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
parent be94716d
default:
# we always retry a failed job, so it has a chance to recover from
# e.g. a faulty machine or a timing issue
retry: 2
variables:
# When a branch derives from master or 10.4 or something, composer stumbles
# if the repo has been 'shallow cloned', can't determine the source branch
......
......@@ -10,7 +10,6 @@ acceptance backend mariadb php 7.2 min:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
parallel: 8
script:
- Build/Scripts/runTests.sh -s composerInstallMin -p 7.2
......@@ -28,7 +27,6 @@ acceptance backend mariadb php 7.3 max:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
parallel: 8
script:
- Build/Scripts/runTests.sh -s composerInstallMax -p 7.3
......@@ -42,7 +40,6 @@ acceptance backend mariadb php 7.4 locked:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
parallel: 8
script:
- Build/Scripts/runTests.sh -s composerInstall -p 7.4
......
......@@ -6,7 +6,6 @@ acceptance install mariadb php 7.2 locked:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstall -p 7.2
- Build/Scripts/runTests.sh -s install -d mariadb -i 10.3 -p 7.2
......@@ -22,7 +21,6 @@ acceptance install mariadb php 7.2 max:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMax -p 7.2
- Build/Scripts/runTests.sh -s install -d mariadb -i 10.3 -p 7.2
......@@ -38,7 +36,6 @@ acceptance install mariadb php 7.2 min:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMin -p 7.2
- Build/Scripts/runTests.sh -s install -d mariadb -i 10.3 -p 7.2
......@@ -51,7 +48,6 @@ acceptance install mariadb php 7.3 locked:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstall -p 7.3
- Build/Scripts/runTests.sh -s install -d mariadb -i 10.3 -p 7.3
......@@ -67,7 +63,6 @@ acceptance install mariadb php 7.3 max:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMax -p 7.3
- Build/Scripts/runTests.sh -s install -d mariadb -i 10.3 -p 7.3
......@@ -83,7 +78,6 @@ acceptance install mariadb php 7.3 min:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMin -p 7.3
- Build/Scripts/runTests.sh -s install -d mariadb -i 10.3 -p 7.3
......@@ -96,7 +90,6 @@ acceptance install mariadb php 7.4 locked:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstall -p 7.4
- Build/Scripts/runTests.sh -s install -d mariadb -i 10.3 -p 7.4
......@@ -112,7 +105,6 @@ acceptance install mariadb php 7.4 max:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMax -p 7.4
- Build/Scripts/runTests.sh -s install -d mariadb -i 10.3 -p 7.4
......@@ -128,7 +120,6 @@ acceptance install mariadb php 7.4 min:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMin -p 7.4
- Build/Scripts/runTests.sh -s install -d mariadb -i 10.3 -p 7.4
......@@ -142,7 +133,6 @@ acceptance install mysql php 7.2 locked:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstall -p 7.2
- Build/Scripts/runTests.sh -s install -d mysql -j 5.5 -p 7.2
......@@ -158,7 +148,6 @@ acceptance install mysql php 7.2 max:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMax -p 7.2
- Build/Scripts/runTests.sh -s install -d mysql -j 5.5 -p 7.2
......@@ -174,7 +163,6 @@ acceptance install mysql php 7.2 min:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMin -p 7.2
- Build/Scripts/runTests.sh -s install -d mysql -j 5.5 -p 7.2
......@@ -187,7 +175,6 @@ acceptance install mysql php 7.3 locked:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstall -p 7.3
- Build/Scripts/runTests.sh -s install -d mysql -j 5.5 -p 7.3
......@@ -203,7 +190,6 @@ acceptance install mysql php 7.3 max:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMax -p 7.3
- Build/Scripts/runTests.sh -s install -d mysql -j 5.5 -p 7.3
......@@ -219,7 +205,6 @@ acceptance install mysql php 7.3 min:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMin -p 7.3
- Build/Scripts/runTests.sh -s install -d mysql -j 5.5 -p 7.3
......@@ -232,7 +217,6 @@ acceptance install mysql php 7.4 locked:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstall -p 7.4
- Build/Scripts/runTests.sh -s install -d mysql -j 5.5 -p 7.4
......@@ -248,7 +232,6 @@ acceptance install mysql php 7.4 max:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMax -p 7.4
- Build/Scripts/runTests.sh -s install -d mysql -j 5.5 -p 7.4
......@@ -264,7 +247,6 @@ acceptance install mysql php 7.4 min:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMin -p 7.4
- Build/Scripts/runTests.sh -s install -d mysql -j 5.5 -p 7.4
......@@ -278,7 +260,6 @@ acceptance install postgres php 7.2 locked:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstall -p 7.2
- Build/Scripts/runTests.sh -s install -d postgres -k 10 -p 7.2
......@@ -294,7 +275,6 @@ acceptance install postgres php 7.2 max:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMax -p 7.2
- Build/Scripts/runTests.sh -s install -d postgres -k 10 -p 7.2
......@@ -310,7 +290,6 @@ acceptance install postgres php 7.2 min:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMin -p 7.2
- Build/Scripts/runTests.sh -s install -d postgres -k 10 -p 7.2
......@@ -323,7 +302,6 @@ acceptance install postgres php 7.3 locked:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstall -p 7.3
- Build/Scripts/runTests.sh -s install -d postgres -k 10 -p 7.3
......@@ -339,7 +317,6 @@ acceptance install postgres php 7.3 max:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMax -p 7.3
- Build/Scripts/runTests.sh -s install -d postgres -k 10 -p 7.3
......@@ -355,7 +332,6 @@ acceptance install postgres php 7.3 min:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMin -p 7.3
- Build/Scripts/runTests.sh -s install -d postgres -k 10 -p 7.3
......@@ -368,7 +344,6 @@ acceptance install postgres php 7.4 locked:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstall -p 7.4
- Build/Scripts/runTests.sh -s install -d postgres -k 10 -p 7.4
......@@ -384,7 +359,6 @@ acceptance install postgres php 7.4 max:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMax -p 7.4
- Build/Scripts/runTests.sh -s install -d postgres -k 10 -p 7.4
......@@ -400,7 +374,6 @@ acceptance install postgres php 7.4 min:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMin -p 7.4
- Build/Scripts/runTests.sh -s install -d postgres -k 10 -p 7.4
......@@ -414,7 +387,6 @@ acceptance install sqlite php 7.2 locked:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstall -p 7.2
- Build/Scripts/runTests.sh -s install -d sqlite -p 7.2
......@@ -430,7 +402,6 @@ acceptance install sqlite php 7.2 max:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMax -p 7.2
- Build/Scripts/runTests.sh -s install -d sqlite -p 7.2
......@@ -446,7 +417,6 @@ acceptance install sqlite php 7.2 min:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMin -p 7.2
- Build/Scripts/runTests.sh -s install -d sqlite -p 7.2
......@@ -459,7 +429,6 @@ acceptance install sqlite php 7.3 locked:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstall -p 7.3
- Build/Scripts/runTests.sh -s install -d sqlite -p 7.3
......@@ -475,7 +444,6 @@ acceptance install sqlite php 7.3 max:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMax -p 7.3
- Build/Scripts/runTests.sh -s install -d sqlite -p 7.3
......@@ -491,7 +459,6 @@ acceptance install sqlite php 7.3 min:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMin -p 7.3
- Build/Scripts/runTests.sh -s install -d sqlite -p 7.3
......@@ -504,7 +471,6 @@ acceptance install sqlite php 7.4 locked:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstall -p 7.4
- Build/Scripts/runTests.sh -s install -d sqlite -p 7.4
......@@ -520,7 +486,6 @@ acceptance install sqlite php 7.4 max:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMax -p 7.4
- Build/Scripts/runTests.sh -s install -d sqlite -p 7.4
......@@ -536,7 +501,6 @@ acceptance install sqlite php 7.4 min:
when: on_failure
paths:
- typo3temp/var/tests/AcceptanceReports
retry: 2
script:
- Build/Scripts/runTests.sh -s composerInstallMin -p 7.4
- Build/Scripts/runTests.sh -s install -d sqlite -p 7.4
......@@ -35,7 +35,6 @@ functional mssql php 7.4 locked:
stage: functional2
only:
- schedules
retry: 2
parallel: 12
script:
- Build/Scripts/runTests.sh -s composerInstall -p 7.4
......@@ -48,7 +47,6 @@ functional mssql php 7.3 max:
key: 9.5-composer-max
paths:
- .cache
retry: 2
parallel: 12
script:
- Build/Scripts/runTests.sh -s composerInstallMax -p 7.3
......@@ -61,7 +59,6 @@ functional min mssql php 7.2 min pdo_sqlsrv:
key: 9.5-composer-min
paths:
- .cache
retry: 2
parallel: 12
script:
- Build/Scripts/runTests.sh -s composerInstallMin -p 7.2
......
......@@ -4,7 +4,6 @@ acceptance backend mariadb php 7.3 pre-merge:
refs:
- schedules
- "9.5"
retry: 2
artifacts:
when: on_failure
paths:
......
......@@ -4,7 +4,6 @@ acceptance install mariadb php 7.4 pre-merge:
refs:
- schedules
- "9.5"
retry: 2
artifacts:
when: on_failure
paths:
......@@ -19,7 +18,6 @@ acceptance install mysql php 7.4 pre-merge:
refs:
- schedules
- "9.5"
retry: 2
artifacts:
when: on_failure
paths:
......@@ -34,7 +32,6 @@ acceptance install postgres php 7.3 pre-merge:
refs:
- schedules
- "9.5"
retry: 2
artifacts:
when: on_failure
paths:
......@@ -49,7 +46,6 @@ acceptance install sqlite php 7.2 pre-merge:
refs:
- schedules
- "9.5"
retry: 2
artifacts:
when: on_failure
paths:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment