Skip to content

Commit e87dc05

Browse files
committed
Fix idempotence test and add config for older MySQL versions.
1 parent a984885 commit e87dc05

File tree

5 files changed

+8
-1
lines changed

5 files changed

+8
-1
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ script:
4444
- 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
4545

4646
# Test role idempotence.
47+
- idempotence=$(mktemp)
48+
- sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} | tee -a ${idempotence}
4749
- >
48-
sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}
50+
tail ${idempotence}
4951
| grep -q 'changed=0.*failed=0'
5052
&& (echo 'Idempotence test: pass' && exit 0)
5153
|| (echo 'Idempotence test: fail' && exit 1)

templates/my.cnf.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ max_connections = {{ mysql_max_connections }}
8282
wait_timeout = {{ mysql_wait_timeout }}
8383

8484
# InnoDB settings.
85+
{% if mysql_supports_innodb_large_prefix %}
8586
innodb_large_prefix = {{ mysql_innodb_large_prefix }}
87+
{% endif %}
8688
innodb_file_format = {{ mysql_innodb_file_format }}
8789
innodb_file_per_table = {{ mysql_innodb_file_per_table }}
8890
innodb_buffer_pool_size = {{ mysql_innodb_buffer_pool_size }}

vars/Debian.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ __mysql_slow_query_log_file: /var/log/mysql/mysql-slow.log
77
mysql_config_file: /etc/mysql/my.cnf
88
mysql_config_include_dir: /etc/mysql/conf.d
99
mysql_socket: /var/run/mysqld/mysqld.sock
10+
mysql_supports_innodb_large_prefix: false

vars/RedHat-6.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ __mysql_slow_query_log_file: /var/log/mysql-slow.log
77
mysql_config_file: /etc/my.cnf
88
mysql_config_include_dir: /etc/my.cnf.d
99
mysql_socket: /var/lib/mysql/mysql.sock
10+
mysql_supports_innodb_large_prefix: false

vars/RedHat-7.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ mysql_pid_file: /var/run/mariadb/mariadb.pid
1313
mysql_config_file: /etc/my.cnf
1414
mysql_config_include_dir: /etc/my.cnf.d
1515
mysql_socket: /var/lib/mysql/mysql.sock
16+
mysql_supports_innodb_large_prefix: false

0 commit comments

Comments
 (0)