File tree Expand file tree Collapse file tree 5 files changed +8
-1
lines changed Expand file tree Collapse file tree 5 files changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -44,8 +44,10 @@ script:
44
44
- ' sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
45
45
46
46
# 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}
47
49
- >
48
- sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook }
50
+ tail ${idempotence }
49
51
| grep -q 'changed=0.*failed=0'
50
52
&& (echo 'Idempotence test: pass' && exit 0)
51
53
|| (echo 'Idempotence test: fail' && exit 1)
Original file line number Diff line number Diff line change @@ -82,7 +82,9 @@ max_connections = {{ mysql_max_connections }}
82
82
wait_timeout = {{ mysql_wait_timeout }}
83
83
84
84
# InnoDB settings.
85
+ {% if mysql_supports_innodb_large_prefix %}
85
86
innodb_large_prefix = {{ mysql_innodb_large_prefix }}
87
+ {% endif %}
86
88
innodb_file_format = {{ mysql_innodb_file_format }}
87
89
innodb_file_per_table = {{ mysql_innodb_file_per_table }}
88
90
innodb_buffer_pool_size = {{ mysql_innodb_buffer_pool_size }}
Original file line number Diff line number Diff line change @@ -7,3 +7,4 @@ __mysql_slow_query_log_file: /var/log/mysql/mysql-slow.log
7
7
mysql_config_file : /etc/mysql/my.cnf
8
8
mysql_config_include_dir : /etc/mysql/conf.d
9
9
mysql_socket : /var/run/mysqld/mysqld.sock
10
+ mysql_supports_innodb_large_prefix : false
Original file line number Diff line number Diff line change @@ -7,3 +7,4 @@ __mysql_slow_query_log_file: /var/log/mysql-slow.log
7
7
mysql_config_file : /etc/my.cnf
8
8
mysql_config_include_dir : /etc/my.cnf.d
9
9
mysql_socket : /var/lib/mysql/mysql.sock
10
+ mysql_supports_innodb_large_prefix : false
Original file line number Diff line number Diff line change @@ -13,3 +13,4 @@ mysql_pid_file: /var/run/mariadb/mariadb.pid
13
13
mysql_config_file : /etc/my.cnf
14
14
mysql_config_include_dir : /etc/my.cnf.d
15
15
mysql_socket : /var/lib/mysql/mysql.sock
16
+ mysql_supports_innodb_large_prefix : false
You can’t perform that action at this time.
0 commit comments