fix(supported-version): model MariaDB as a separate service from MySQL

The `mariadb:11.4` image used by Magento 2.4.9 no longer ships
`mysqladmin`, so the existing single MySQL service template
(`--health-cmd="mysqladmin ping"`) fails its health check and the
`setup-install` lane is torn down at "Initialize containers". A simple
swap to `healthcheck.sh --connect --innodb_initialized` would break the
`mysql:8.4` lanes (the script is MariaDB-only), so a single template
cannot cover both engines.

Per @damienwebdev's direction on issue #365, model MariaDB as its own
first-class service, mirroring the existing opensearch/elasticsearch
and valkey/redis patterns:

- `matrix-type.ts`: add `mariadb: string` to `PackageMatrixVersion`
- `service-config.ts`: add `mariadbConfig` with the healthcheck.sh
  command; leave `mysqlConfig` with `mysqladmin ping`
- `build-services.ts`: add `getDatabaseChoice()` that prefers mariadb
  over mysql; emit either `services.mariadb` or `services.mysql`
- version JSON: 22 entries that encoded MariaDB by stuffing the image
  into the `mysql` field now use a top-level `mariadb` key instead
- `build-services.spec.ts`: add a database-selection describe block
- `amend-matrix-for-next.spec.ts`: fixtures gain `mariadb: ""` to
  satisfy the new required field
- `.github/workflows/integration.yaml`: port lookup falls back from
  `job.services.mysql.ports['3306']` to the mariadb key
- `supported-version/README.md`: include_services description mentions
  MariaDB alongside MySQL
- `dist/index.js`: rebuilt

Fixes #365

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: rhoerr

.github/workflows/integration.yaml

@@ -74,7 +74,7 @@ jobs:
 
     - name: Allow SQL triggers
       run: |
-        mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports['3306'] }} -u root -prootpassword -e "set global log_bin_trust_function_creators=1;"
+        mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports['3306'] || job.services.mariadb.ports['3306'] }} -u root -prootpassword -e "set global log_bin_trust_function_creators=1;"
 
     - run: composer create-project --repository-url="${{ inputs.magento_repository }}" "${{ matrix.magento }}" ${{ inputs.magento_directory }} --no-install
       shell: bash

supported-version/README.md

@@ -17,7 +17,7 @@ See the [action.yml](./action.yml)
 | project           | The project to return the supported versions for. Allowed values are `mage-os` and `magento-open-source`                                                      | false    | 'magento-open-source' |
 | custom_versions   | The versions you want to support, as a comma-separated string, i.e. 'magento/project-community-edition:2.3.7-p3, magento/project-community-edition:2.4.2-p2' | false    | ''                    |
 | recent_time_frame | The time frame (from today) used when `kind` is `recent`. Combination of years (y), months (m), and days (d), e.g. `2y 2m 2d`.                               | false    | '2y'                  |
-| include_services | Whether to include a `services` key in each matrix entry with GitHub Actions service container configurations for MySQL, search engine, RabbitMQ, and cache. | false    | 'true'                |
+| include_services | Whether to include a `services` key in each matrix entry with GitHub Actions service container configurations for the database (MySQL or MariaDB), search engine, RabbitMQ, and cache. | false    | 'true'                |
 
 ## Kinds
 - `currently-supported` - The currently supported Magento Open Source versions by Adobe.

supported-version/dist/index.js

@@ -14,6 +14,7 @@ export interface PackageMatrixVersion {
     php: string | number,
     composer: string | number,
     mysql: string,
+    mariadb: string,
     elasticsearch: string,
     opensearch: string,
     rabbitmq: string,

supported-version/src/matrix/matrix-type.ts

@@ -11,6 +11,7 @@ describe('amendMatrixForNext', () => {
                             "php": 8.2,
                             "composer": "2",
                             "mysql": "mysql:8.0",
+                            "mariadb": "",
                             "elasticsearch": "elasticsearch:8.5.3",
                             "opensearch": "",
                             "rabbitmq": "rabbitmq:3.11-management",
@@ -36,6 +37,7 @@ describe('amendMatrixForNext', () => {
                         "php": 8.2,
                         "composer": "2",
                         "mysql": "mysql:8.0",
+                        "mariadb": "",
                         "elasticsearch": "elasticsearch:8.5.3",
                         "opensearch": "",
                         "rabbitmq": "rabbitmq:3.11-management",
@@ -63,6 +65,7 @@ describe('amendMatrixForNext', () => {
                             "php": 8.2,
                             "composer": "2",
                             "mysql": "mysql:8.0",
+                            "mariadb": "",
                             "elasticsearch": "elasticsearch:8.5.3",
                             "opensearch": "",
                             "rabbitmq": "rabbitmq:3.11-management",
@@ -88,6 +91,7 @@ describe('amendMatrixForNext', () => {
                         "php": 8.2,
                         "composer": "2",
                         "mysql": "mysql:8.0",
+                        "mariadb": "",
                         "elasticsearch": "elasticsearch:8.5.3",
                         "opensearch": "",
                         "rabbitmq": "rabbitmq:3.11-management",
@@ -115,6 +119,7 @@ describe('amendMatrixForNext', () => {
                             "php": 8.2,
                             "composer": "2",
                             "mysql": "mysql:8.0",
+                            "mariadb": "",
                             "elasticsearch": "elasticsearch:8.5.3",
                             "opensearch": "",
                             "rabbitmq": "rabbitmq:3.11-management",
@@ -131,6 +136,7 @@ describe('amendMatrixForNext', () => {
                             "php": 8.2,
                             "composer": "2",
                             "mysql": "mysql:8.0",
+                            "mariadb": "",
                             "elasticsearch": "elasticsearch:8.5.3",
                             "opensearch": "",
                             "rabbitmq": "rabbitmq:3.11-management",
@@ -156,6 +162,7 @@ describe('amendMatrixForNext', () => {
                         "php": 8.2,
                         "composer": "2",
                         "mysql": "mysql:8.0",
+                        "mariadb": "",
                         "elasticsearch": "elasticsearch:8.5.3",
                         "opensearch": "",
                         "rabbitmq": "rabbitmq:3.11-management",
@@ -172,6 +179,7 @@ describe('amendMatrixForNext', () => {
                         "php": 8.2,
                         "composer": "2",
                         "mysql": "mysql:8.0",
+                        "mariadb": "",
                         "elasticsearch": "elasticsearch:8.5.3",
                         "opensearch": "",
                         "rabbitmq": "rabbitmq:3.11-management",
@@ -199,6 +207,7 @@ describe('amendMatrixForNext', () => {
                             "php": 8.2,
                             "composer": "2",
                             "mysql": "mysql:8.0",
+                            "mariadb": "",
                             "elasticsearch": "elasticsearch:8.5.3",
                             "opensearch": "",
                             "rabbitmq": "rabbitmq:3.11-management",
@@ -224,6 +233,7 @@ describe('amendMatrixForNext', () => {
                         "php": 8.2,
                         "composer": "2",
                         "mysql": "mysql:8.0",
+                        "mariadb": "",
                         "elasticsearch": "elasticsearch:8.5.3",
                         "opensearch": "",
                         "rabbitmq": "rabbitmq:3.11-management",

supported-version/src/nightly/amend-matrix-for-next.spec.ts

@@ -6,6 +6,7 @@ const createTestEntry = (overrides: Partial<PackageMatrixVersion> = {}): Package
   php: '8.3',
   composer: '2.7.4',
   mysql: 'mysql:8.4',
+  mariadb: '',
   elasticsearch: 'elasticsearch:8.11.4',
   opensearch: 'opensearchproject/opensearch:2.19.1',
   rabbitmq: 'rabbitmq:4.0-management',
@@ -20,6 +21,62 @@ const createTestEntry = (overrides: Partial<PackageMatrixVersion> = {}): Package
 });
 
 describe('buildServicesForEntry', () => {
+  describe('database selection', () => {
+    it('should prefer mariadb when both are available', () => {
+      const entry = createTestEntry({ mariadb: 'mariadb:11.4' });
+      const services = buildServicesForEntry(entry);
+
+      expect(services.mariadb).toBeDefined();
+      expect(services.mariadb.image).toBe('mariadb:11.4');
+      expect(services.mysql).toBeUndefined();
+    });
+
+    it('should fall back to mysql when mariadb is empty', () => {
+      const entry = createTestEntry();
+      const services = buildServicesForEntry(entry);
+
+      expect(services.mysql).toBeDefined();
+      expect(services.mysql.image).toBe('mysql:8.4');
+      expect(services.mariadb).toBeUndefined();
+    });
+
+    it('should not include database when neither is available', () => {
+      const entry = createTestEntry({ mysql: '', mariadb: '' });
+      const services = buildServicesForEntry(entry);
+
+      expect(services.mysql).toBeUndefined();
+      expect(services.mariadb).toBeUndefined();
+    });
+
+    it('should use healthcheck.sh for mariadb', () => {
+      const entry = createTestEntry({ mariadb: 'mariadb:11.4' });
+      const services = buildServicesForEntry(entry);
+
+      expect(services.mariadb.options).toContain('--health-cmd');
+      expect(services.mariadb.options).toContain('healthcheck.sh');
+      expect(services.mariadb.options).toContain('--innodb_initialized');
+    });
+
+    it('should include correct mariadb env configuration', () => {
+      const entry = createTestEntry({ mariadb: 'mariadb:11.4' });
+      const services = buildServicesForEntry(entry);
+
+      expect(services.mariadb.env).toEqual({
+        MYSQL_DATABASE: 'magento_integration_tests',
+        MYSQL_USER: 'user',
+        MYSQL_PASSWORD: 'password',
+        MYSQL_ROOT_PASSWORD: 'rootpassword'
+      });
+    });
+
+    it('should include correct mariadb ports', () => {
+      const entry = createTestEntry({ mariadb: 'mariadb:11.4' });
+      const services = buildServicesForEntry(entry);
+
+      expect(services.mariadb.ports).toEqual(['3306:3306']);
+    });
+  });
+
   describe('search engine selection', () => {
     it('should prefer opensearch when both are available', () => {
       const entry = createTestEntry();

supported-version/src/services/build-services.spec.ts

@@ -1,13 +1,19 @@
 import { PackageMatrixVersion, Services } from '../matrix/matrix-type';
 import {
   mysqlConfig,
+  mariadbConfig,
   elasticsearchConfig,
   opensearchConfig,
   rabbitmqConfig,
   redisConfig,
   valkeyConfig
 } from './service-config';
 
+interface DatabaseChoice {
+  type: 'mariadb' | 'mysql';
+  image: string;
+}
+
 interface SearchEngineChoice {
   type: 'opensearch' | 'elasticsearch';
   image: string;
@@ -18,6 +24,20 @@ interface CacheChoice {
   image: string;
 }
 
+/**
+ * Determines which database to use for a matrix entry.
+ * Prefers mariadb over mysql.
+ */
+function getDatabaseChoice(entry: PackageMatrixVersion): DatabaseChoice | null {
+  if (entry.mariadb && entry.mariadb.trim() !== '') {
+    return { type: 'mariadb', image: entry.mariadb };
+  }
+  if (entry.mysql && entry.mysql.trim() !== '') {
+    return { type: 'mysql', image: entry.mysql };
+  }
+  return null;
+}
+
 /**
  * Determines which search engine to use for a matrix entry.
  * Prefers opensearch over elasticsearch.
@@ -52,9 +72,14 @@ function getCacheChoice(entry: PackageMatrixVersion): CacheChoice | null {
 export function buildServicesForEntry(entry: PackageMatrixVersion): Services {
   const services: Services = {};
 
-  // MySQL is always included if present
-  if (entry.mysql && entry.mysql.trim() !== '') {
-    services.mysql = mysqlConfig.getConfig(entry.mysql);
+  // Database: prefer mariadb over mysql
+  const database = getDatabaseChoice(entry);
+  if (database) {
+    if (database.type === 'mariadb') {
+      services.mariadb = mariadbConfig.getConfig(database.image);
+    } else {
+      services.mysql = mysqlConfig.getConfig(database.image);
+    }
   }
 
   // Search engine: prefer opensearch over elasticsearch
@@ -83,4 +108,4 @@ export function buildServicesForEntry(entry: PackageMatrixVersion): Services {
   }
 
   return services;
-}
+}

supported-version/src/services/build-services.ts

@@ -20,6 +20,22 @@ export const mysqlConfig: ServiceTemplate = {
   }
 };
 
+export const mariadbConfig: ServiceTemplate = {
+  getConfig(image: string): ServiceConfig {
+    return {
+      image,
+      env: {
+        MYSQL_DATABASE: 'magento_integration_tests',
+        MYSQL_USER: 'user',
+        MYSQL_PASSWORD: 'password',
+        MYSQL_ROOT_PASSWORD: 'rootpassword'
+      },
+      ports: ['3306:3306'],
+      options: '--health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3'
+    };
+  }
+};
+
 export const elasticsearchConfig: ServiceTemplate = {
   getConfig(image: string): ServiceConfig {
     return {

supported-version/src/services/service-config.ts

@@ -3,7 +3,7 @@
     "magento": "mage-os/project-community-edition:>=1.0 <1.1",
     "php": 8.3,
     "composer": "2.9.7",
-    "mysql": "mariadb:10.6",
+    "mariadb": "mariadb:10.6",
     "elasticsearch": "elasticsearch:8.11.4",
     "rabbitmq": "rabbitmq:3.13-management",
     "redis": "redis:7.2",

supported-version/src/versions/mage-os/composite.json

@@ -34,7 +34,7 @@
         "upstream": "2.4.7-p1",
         "php": 8.3,
         "composer": "2.7.4",
-        "mysql": "mariadb:10.6",
+        "mariadb": "mariadb:10.6",
         "elasticsearch": "elasticsearch:8.11.4",
         "rabbitmq": "rabbitmq:3.13-management",
         "redis": "redis:7.2",
@@ -49,7 +49,7 @@
         "upstream": "2.4.7-p1",
         "php": 8.3,
         "composer": "2.7.4",
-        "mysql": "mariadb:10.6",
+        "mariadb": "mariadb:10.6",
         "elasticsearch": "elasticsearch:8.11.4",
         "rabbitmq": "rabbitmq:3.13-management",
         "redis": "redis:7.2",
@@ -64,7 +64,7 @@
         "upstream": "2.4.7-p2",
         "php": 8.3,
         "composer": "2.7.4",
-        "mysql": "mariadb:10.6",
+        "mariadb": "mariadb:10.6",
         "elasticsearch": "elasticsearch:8.11.4",
         "rabbitmq": "rabbitmq:3.13-management",
         "redis": "redis:7.2",
@@ -79,7 +79,7 @@
         "upstream": "2.4.7-p3",
         "php": 8.3,
         "composer": "2.7.4",
-        "mysql": "mariadb:10.6",
+        "mariadb": "mariadb:10.6",
         "elasticsearch": "elasticsearch:8.11.4",
         "rabbitmq": "rabbitmq:3.13-management",
         "redis": "redis:7.2",
@@ -94,7 +94,7 @@
         "upstream": "2.4.7-p4",
         "php": 8.3,
         "composer": "2.7.4",
-        "mysql": "mariadb:10.6",
+        "mariadb": "mariadb:10.6",
         "elasticsearch": "elasticsearch:8.11.4",
         "rabbitmq": "rabbitmq:3.13-management",
         "redis": "redis:7.2",