From ffbcb84908b1e53dd24ce6e021aff281276c2ef6 Mon Sep 17 00:00:00 2001 From: mariadb-RomanNavrotskiy Date: Wed, 24 Mar 2021 10:15:57 +0200 Subject: [PATCH] ci: default client charset for regression run --- .drone.jsonnet | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index d45404125..ae964500b 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -46,6 +46,7 @@ local Pipeline(branch, platform, event, arch='amd64') = { local init = if (pkg_format == 'rpm') then '/usr/lib/systemd/systemd' else 'systemd', local mtr_path = if (pkg_format == 'rpm') then '/usr/share/mysql-test' else '/usr/share/mysql/mysql-test', local socket_path = if (pkg_format == 'rpm') then '/var/lib/mysql/mysql.sock' else '/run/mysqld/mysqld.sock', + local config_path_prefix = if (pkg_format == 'rpm') then '/etc/my.cnf.d/' else '/etc/mysql/mariadb.conf.d/50-', local img = if (std.split(platform, ':')[0] == 'centos') then platform else 'romcheck/' + std.strReplace(platform, '/', '-'), local regression_ref = if (std.split(branch, '-')[0] == 'develop') then branch else 'develop-5', @@ -179,7 +180,9 @@ local Pipeline(branch, platform, event, arch='amd64') = { // copy test data for regression test suite 'docker exec -t regression$${DRONE_BUILD_NUMBER} bash -c "wget -qO- https://cspkg.s3.amazonaws.com/testData.tar.lz4 | lz4 -dc - | tar xf - -C mariadb-columnstore-regression-test/"', // set mariadb lower_case_table_names=1 config option - 'docker exec -t regression$${DRONE_BUILD_NUMBER} sed -i "/^.mariadb.$/a lower_case_table_names=1" /etc/' + (if (pkg_format == 'deb') then 'mysql/mariadb.conf.d/50-' else 'my.cnf.d/') + 'server.cnf', + 'docker exec -t regression$${DRONE_BUILD_NUMBER} sed -i "/^.mariadb.$/a lower_case_table_names=1" ' + config_path_prefix + 'server.cnf', + // set default client character set to utf-8 + 'docker exec -t regression$${DRONE_BUILD_NUMBER} sed -i "/^.client.$/a default-character-set=utf8" ' + config_path_prefix + 'client.cnf', // start mariadb and mariadb-columnstore services 'docker exec -t regression$${DRONE_BUILD_NUMBER} systemctl start mariadb', 'docker exec -t regression$${DRONE_BUILD_NUMBER} systemctl start mariadb-columnstore',