Skip to content

Commit 260a86d

Browse files
authored
ping 8.0.36 version for mysql (#17786)
* ping 8.0.36 version for mysql * revert to 8.0 for replication group
1 parent 3b8ad87 commit 260a86d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

mysql/hatch.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ mypy-deps = [
1717
python = ["3.11"]
1818
version = [
1919
"5.7", # EOL October 21, 2023
20-
"8.0", # EOL April, 2026
20+
"8.0.36", # EOL April, 2026
2121
]
2222

2323
[[envs.default.matrix]]
@@ -39,7 +39,7 @@ version = [
3939

4040
[envs.default.overrides]
4141
matrix.version.env-vars = [
42-
{ key = "COMPOSE_FILE", value = "mysql8.yaml", if = ["8.0"] },
42+
{ key = "COMPOSE_FILE", value = "mysql8.yaml", if = ["8.0.36"] },
4343
]
4444
name."8.0-group".env-vars = [
4545
{ key = "COMPOSE_FILE", value = "mysql8-group.yaml" },

mysql/tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ def _mysql_docker_repo():
513513
# https://github.com/DataDog/integrations-core/pull/4669)
514514
if MYSQL_VERSION in ('5.6', '5.7'):
515515
return 'bergerx/mysql-replication'
516-
elif MYSQL_VERSION == '8.0' or MYSQL_VERSION == 'latest':
516+
elif MYSQL_VERSION.startswith('8') or MYSQL_VERSION == 'latest':
517517
return 'bitnami/mysql'
518518
elif MYSQL_FLAVOR == 'mariadb':
519519
return 'bitnami/mariadb'

0 commit comments

Comments
 (0)