Merge pull request #1498 from datajoint/ci/mysql-8.4-matrix

ci: test MySQL 8.0 and 8.4 (LTS) in the matrix; parameterize MySQL image

Author: dimitri-yatsenko

.github/workflows/test.yaml

@@ -30,11 +30,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Exercise both ends of the supported range (requires-python
-        # >=3.10,<3.15). The version-pinned pixi environments are defined in
-        # pyproject.toml under [tool.pixi.environments].
+        # Python: exercise both ends of the supported range (requires-python
+        # >=3.10,<3.15); version-pinned pixi environments live in pyproject.toml
+        # under [tool.pixi.environments].
         environment: [test-py310, test-py314]
-    name: test (${{ matrix.environment }})
+        # MySQL: exercise both LTS lines we support / that AWS RDS runs. 8.0 uses
+        # the datajoint image (SSL configured); 8.4 uses the official image (TLS
+        # tests already skip outside external containers). See #1497.
+        mysql-image: ["datajoint/mysql:8.0", "mysql:8.4"]
+    name: test (${{ matrix.environment }}, mysql=${{ matrix.mysql-image }})
     steps:
       - uses: actions/checkout@v4
 
@@ -46,6 +50,8 @@ jobs:
           environments: ${{ matrix.environment }}
 
       - name: Run tests
+        env:
+          DJ_TEST_MYSQL_IMAGE: ${{ matrix.mysql-image }}
         run: pixi run -e ${{ matrix.environment }} test-cov
 
   # Unit tests run without containers (faster feedback)

tests/conftest.py

@@ -114,7 +114,10 @@ def mysql_container():
     from testcontainers.mysql import MySqlContainer
 
     container = MySqlContainer(
-        image="datajoint/mysql:8.0",  # Use datajoint image which has SSL configured
+        # Default: the datajoint image (SSL configured, for TLS tests under
+        # external containers). CI overrides via DJ_TEST_MYSQL_IMAGE to exercise
+        # multiple supported server versions (e.g. the 8.4 LTS line). See #1497.
+        image=os.environ.get("DJ_TEST_MYSQL_IMAGE", "datajoint/mysql:8.0"),
         username="root",
         password="password",
         dbname="test",