From a2c2025d9ecc97aebf0e076602cb6a568a522dd7 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Fri, 24 Nov 2023 12:48:52 +0000
Subject: [PATCH] Issue #3385621 by fjgarlin, andypost, dimitriskr, longwave:
[GitlabCI] MariaDB currently not working
---
.gitlab-ci.yml | 17 +++++------------
.gitlab-ci/pipeline.yml | 1 +
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c6aeaeb16b9..e9c66d1f085a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -202,18 +202,11 @@ default:
_TARGET_PHP: "8.3"
_TARGET_DB: "sqlite-3"
-# Run daily, or manually.
-# 'PHP 8.1 MariaDB 10.3.22':
-# <<: [ *default-stage, *run-daily ]
-# variables:
-# _TARGET_PHP: "8.1"
-# _TARGET_DB: "mariadb-10.3.22"
-
-# 'PHP 8.1 MySQL 5.7 with updated deps':
-# <<: [ *default-stage, *run-daily ]
-# variables:
-# _TARGET_PHP: "8.1"
-# _TARGET_DB: "mysql-5.7"
+'PHP 8.1 MariaDB 10.3.22':
+ <<: [ *default-stage, *run-daily ]
+ variables:
+ _TARGET_PHP: "8.1"
+ _TARGET_DB: "mariadb-10.3.22"
'PHP 8.1 PostgreSQL 14.1':
<<: [ *default-stage, *run-daily ]
diff --git a/.gitlab-ci/pipeline.yml b/.gitlab-ci/pipeline.yml
index 370b430729dc..1cd72bf1781b 100644
--- a/.gitlab-ci/pipeline.yml
+++ b/.gitlab-ci/pipeline.yml
@@ -25,6 +25,7 @@ default:
[[ $_TARGET_DB == mysql* ]] && export SIMPLETEST_DB=mysql://$MYSQL_USER:$MYSQL_PASSWORD@database/$MYSQL_DATABASE?module=mysql
[[ $_TARGET_DB == mariadb* ]] && export SIMPLETEST_DB=mysql://$MYSQL_USER:$MYSQL_PASSWORD@database/$MYSQL_DATABASE?module=mysql
[[ $_TARGET_DB == pgsql* ]] && export SIMPLETEST_DB=pgsql://$POSTGRES_USER:$POSTGRES_PASSWORD@database/$POSTGRES_DB?module=pgsql
+ - echo "SIMPLETEST_DB = $SIMPLETEST_DB"
- $CI_PROJECT_DIR/.gitlab-ci/scripts/server-setup.sh
after_script:
- sed -i "s#$CI_PROJECT_DIR/##" ./sites/default/files/simpletest/phpunit-*.xml || true
--
GitLab