From f649619e20accdcbb78f628c968b51a75d403be5 Mon Sep 17 00:00:00 2001 From: owensmallwood Date: Wed, 14 Jun 2023 17:00:45 -0600 Subject: [PATCH] Mysql Tests: For mysql5.7 integration tests use utf8mb4 charset (#69953) for mysql5.7 integration tests, use utf8mb4 charset --- .drone.yml | 24 ++++++++++++++++++------ scripts/drone/services/services.star | 1 + 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index ab6145c037b..b19533261ff 100644 --- a/.drone.yml +++ b/.drone.yml @@ -846,7 +846,9 @@ services: volumes: - name: postgres 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_PASSWORD: password MYSQL_ROOT_PASSWORD: rootpass @@ -1943,7 +1945,9 @@ services: volumes: - name: postgres 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_PASSWORD: password MYSQL_ROOT_PASSWORD: rootpass @@ -5287,7 +5291,9 @@ services: volumes: - name: postgres 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_PASSWORD: password MYSQL_ROOT_PASSWORD: rootpass @@ -6013,7 +6019,9 @@ services: volumes: - name: postgres 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_PASSWORD: password MYSQL_ROOT_PASSWORD: rootpass @@ -6553,7 +6561,9 @@ services: volumes: - name: postgres 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_PASSWORD: password MYSQL_ROOT_PASSWORD: rootpass @@ -6730,7 +6740,9 @@ services: volumes: - name: postgres 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_PASSWORD: password MYSQL_ROOT_PASSWORD: rootpass diff --git a/scripts/drone/services/services.star b/scripts/drone/services/services.star index 0140ad0b433..ae2d939cf4b 100644 --- a/scripts/drone/services/services.star +++ b/scripts/drone/services/services.star @@ -39,6 +39,7 @@ def integration_test_services(): "MYSQL_PASSWORD": "password", }, "volumes": [{"name": "mysql57", "path": "/var/lib/mysql"}], + "commands": ["docker-entrypoint.sh mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci"], }, { "name": "mysql80",