From ed5c110e9467cdf90ffc67b0c3dd89aaf63a26c4 Mon Sep 17 00:00:00 2001
From: Juraj Nemec <jnemec@activit.sk>
Date: Thu, 30 Nov 2023 18:18:14 +0100
Subject: [PATCH] Issue #3403989 by dimitriskr, fjgarlin: [D7] GitLab CI tests
for MariaDB currently not working
---
.gitlab-ci.yml | 13 +++++++------
.gitlab-ci/pipeline.yml | 2 ++
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a81a16839923..7ee0d4f1d223 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@ include:
variables:
_TARGET_PHP: "8.1"
- CONCURRENCY: 24
+ CONCURRENCY: 15
GIT_DEPTH: "3"
################
@@ -112,6 +112,7 @@ stages:
stage: 🪄 Lint
variables:
PHPCS_PHP_VERSION: "5.6"
+ KUBERNETES_CPU_REQUEST: "16"
interruptible: true
allow_failure: true
retry:
@@ -203,8 +204,8 @@ stages:
_TARGET_PHP: "7.4"
_TARGET_DB: "sqlite-3"
-# 'PHP 8.1 MariaDB 10.3.22':
-# <<: *default-stage
-# variables:
-# _TARGET_PHP: "8.1"
-# _TARGET_DB: "mariadb-10.3.22"
+'PHP 8.1 MariaDB 10.3.22':
+ <<: *default-stage
+ variables:
+ _TARGET_PHP: "8.1"
+ _TARGET_DB: "mariadb-10.3.22"
diff --git a/.gitlab-ci/pipeline.yml b/.gitlab-ci/pipeline.yml
index 0c7e0b475bf5..c7c64859284e 100644
--- a/.gitlab-ci/pipeline.yml
+++ b/.gitlab-ci/pipeline.yml
@@ -77,6 +77,7 @@ stages:
[[ $_TARGET_DB == mysql* ]] && export SIMPLETEST_DB=mysql://$MYSQL_USER:$MYSQL_PASSWORD@database/$MYSQL_DATABASE
[[ $_TARGET_DB == mariadb* ]] && export SIMPLETEST_DB=mysql://$MYSQL_USER:$MYSQL_PASSWORD@database/$MYSQL_DATABASE
[[ $_TARGET_DB == pgsql* ]] && export SIMPLETEST_DB=pgsql://$POSTGRES_USER:$POSTGRES_PASSWORD@database/$POSTGRES_DB
+ - echo "SIMPLETEST_DB = $SIMPLETEST_DB"
.prepare-dirs: &prepare-dirs
- mkdir -p ./sites/default/files ./sites/default/files/simpletest ./build/logs/junit
@@ -144,6 +145,7 @@ stages:
variables:
<<: *test-variables
CONCURRENCY: "$CONCURRENCY"
+ KUBERNETES_CPU_REQUEST: "16"
'🩹 Test-only changes':
<<: [ *phpunit-artifacts, *setup-webserver, *run-test-only-tests, *default-job-settings ]
--
GitLab