Mysql Tests: For mysql5.7 integration tests use utf8mb4 charset (#69953)

for mysql5.7 integration tests, use utf8mb4 charset
This commit is contained in:
owensmallwood
2023-06-14 17:00:45 -06:00
committed by GitHub
parent 1154720df2
commit f649619e20
2 changed files with 19 additions and 6 deletions

View File

@ -846,7 +846,9 @@ services:
volumes: volumes:
- name: postgres - name: postgres
path: /var/lib/postgresql/data/pgdata path: /var/lib/postgresql/data/pgdata
- environment: - commands:
- docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
environment:
MYSQL_DATABASE: grafana_tests MYSQL_DATABASE: grafana_tests
MYSQL_PASSWORD: password MYSQL_PASSWORD: password
MYSQL_ROOT_PASSWORD: rootpass MYSQL_ROOT_PASSWORD: rootpass
@ -1943,7 +1945,9 @@ services:
volumes: volumes:
- name: postgres - name: postgres
path: /var/lib/postgresql/data/pgdata path: /var/lib/postgresql/data/pgdata
- environment: - commands:
- docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
environment:
MYSQL_DATABASE: grafana_tests MYSQL_DATABASE: grafana_tests
MYSQL_PASSWORD: password MYSQL_PASSWORD: password
MYSQL_ROOT_PASSWORD: rootpass MYSQL_ROOT_PASSWORD: rootpass
@ -5287,7 +5291,9 @@ services:
volumes: volumes:
- name: postgres - name: postgres
path: /var/lib/postgresql/data/pgdata path: /var/lib/postgresql/data/pgdata
- environment: - commands:
- docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
environment:
MYSQL_DATABASE: grafana_tests MYSQL_DATABASE: grafana_tests
MYSQL_PASSWORD: password MYSQL_PASSWORD: password
MYSQL_ROOT_PASSWORD: rootpass MYSQL_ROOT_PASSWORD: rootpass
@ -6013,7 +6019,9 @@ services:
volumes: volumes:
- name: postgres - name: postgres
path: /var/lib/postgresql/data/pgdata path: /var/lib/postgresql/data/pgdata
- environment: - commands:
- docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
environment:
MYSQL_DATABASE: grafana_tests MYSQL_DATABASE: grafana_tests
MYSQL_PASSWORD: password MYSQL_PASSWORD: password
MYSQL_ROOT_PASSWORD: rootpass MYSQL_ROOT_PASSWORD: rootpass
@ -6553,7 +6561,9 @@ services:
volumes: volumes:
- name: postgres - name: postgres
path: /var/lib/postgresql/data/pgdata path: /var/lib/postgresql/data/pgdata
- environment: - commands:
- docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
environment:
MYSQL_DATABASE: grafana_tests MYSQL_DATABASE: grafana_tests
MYSQL_PASSWORD: password MYSQL_PASSWORD: password
MYSQL_ROOT_PASSWORD: rootpass MYSQL_ROOT_PASSWORD: rootpass
@ -6730,7 +6740,9 @@ services:
volumes: volumes:
- name: postgres - name: postgres
path: /var/lib/postgresql/data/pgdata path: /var/lib/postgresql/data/pgdata
- environment: - commands:
- docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
environment:
MYSQL_DATABASE: grafana_tests MYSQL_DATABASE: grafana_tests
MYSQL_PASSWORD: password MYSQL_PASSWORD: password
MYSQL_ROOT_PASSWORD: rootpass MYSQL_ROOT_PASSWORD: rootpass

View File

@ -39,6 +39,7 @@ def integration_test_services():
"MYSQL_PASSWORD": "password", "MYSQL_PASSWORD": "password",
}, },
"volumes": [{"name": "mysql57", "path": "/var/lib/mysql"}], "volumes": [{"name": "mysql57", "path": "/var/lib/mysql"}],
"commands": ["docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci"],
}, },
{ {
"name": "mysql80", "name": "mysql80",