Skip to content

Commit e6cec35

Browse files
committed
Merge branch 'feature/PB-44674_5_4_1-stable-clean' into 'master'
PB-44674 Skip mariaDB10.3 and mariaDB10.5 pipelines See merge request passbolt/passbolt-ce-api!429
2 parents 3ac925c + 2f3b1dd commit e6cec35

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

.gitlab-ci/jobs/php_unit_tests/sequential/php_unit_tests.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -157,17 +157,17 @@ seq-php8.2-mysql5.7:
157157
# - if: '$TEST_DISABLED == null'
158158

159159
## DEBIAN 11 BULLSEYE
160-
seq-php8.2-mariadb10.5:
161-
variables:
162-
PHP_VERSION: "8.2"
163-
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.5"
164-
extends:
165-
- .mysql-template
166-
- .test-template
167-
allow_failure: true
168-
rules:
169-
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
170-
- if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
160+
#seq-php8.2-mariadb10.5:
161+
# variables:
162+
# PHP_VERSION: "8.2"
163+
# DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.5"
164+
# extends:
165+
# - .mysql-template
166+
# - .test-template
167+
# allow_failure: true
168+
# rules:
169+
# - if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "master"'
170+
# - if: '$TEST_DISABLED == null && $CI_COMMIT_BRANCH == "develop"'
171171

172172
#seq-php7.4-postgres13.7:
173173
# variables:
@@ -206,15 +206,15 @@ seq-php8.2-mysql8:
206206
## RPM COMBINATIONS
207207
##
208208
## CENTOS 7 - with remi and mariadb repos
209-
seq-php8.4-mariadb10.3:
210-
variables:
211-
PHP_VERSION: "8.4"
212-
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.3"
213-
extends:
214-
- .mysql-template
215-
- .test-template
216-
rules:
217-
- if: "$TEST_DISABLED == null"
209+
#seq-php8.4-mariadb10.3:
210+
# variables:
211+
# PHP_VERSION: "8.4"
212+
# DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.3"
213+
# extends:
214+
# - .mysql-template
215+
# - .test-template
216+
# rules:
217+
# - if: "$TEST_DISABLED == null"
218218

219219
#seq-php8.0-postgres13.7:
220220
# variables:
@@ -235,15 +235,15 @@ seq-php8.2-postgres15:
235235
- .postgres-template
236236
- .test-template
237237

238-
seq-php8.3-mariadb10.5:
239-
variables:
240-
PHP_VERSION: "8.3"
241-
DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.5"
242-
extends:
243-
- .mysql-template
244-
- .test-template
245-
rules:
246-
- if: "$TEST_DISABLED == null"
238+
#seq-php8.3-mariadb10.5:
239+
# variables:
240+
# PHP_VERSION: "8.3"
241+
# DATABASE_ENGINE_VERSION: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/mariadb:10.5"
242+
# extends:
243+
# - .mysql-template
244+
# - .test-template
245+
# rules:
246+
# - if: "$TEST_DISABLED == null"
247247

248248
seq-php8.3-postgres13:
249249
variables:

0 commit comments

Comments
 (0)