ci(centos): add centos ci; fix test pillar

This commit is contained in:
noelmcloughlin 2021-06-10 00:24:06 +01:00
parent 9722b02187
commit 060b43f303
3 changed files with 8 additions and 7 deletions

View file

@ -138,8 +138,8 @@ default-debian-9-master-py3: {extends: '.test_instance'}
default-ubuntu-2004-master-py3: {extends: '.test_instance'} default-ubuntu-2004-master-py3: {extends: '.test_instance'}
default-ubuntu-1804-master-py3: {extends: '.test_instance'} default-ubuntu-1804-master-py3: {extends: '.test_instance'}
default-ubuntu-1604-master-py3: {extends: '.test_instance'} default-ubuntu-1604-master-py3: {extends: '.test_instance'}
# default-centos-8-master-py3: {extends: '.test_instance'} default-centos-8-master-py3: {extends: '.test_instance'}
# default-centos-7-master-py3: {extends: '.test_instance'} default-centos-7-master-py3: {extends: '.test_instance'}
# default-fedora-34-master-py3: {extends: '.test_instance'} # default-fedora-34-master-py3: {extends: '.test_instance'}
# default-fedora-33-master-py3: {extends: '.test_instance'} # default-fedora-33-master-py3: {extends: '.test_instance'}
# default-fedora-32-master-py3: {extends: '.test_instance'} # default-fedora-32-master-py3: {extends: '.test_instance'}

View file

@ -6,6 +6,8 @@ if (os[:name] == 'suse') || (os[:name] == 'opensuse')
package_name = 'mariadb' package_name = 'mariadb'
elsif (os[:name] == 'debian') && os[:release].start_with?('8') elsif (os[:name] == 'debian') && os[:release].start_with?('8')
package_name = 'mysql-server' package_name = 'mysql-server'
elsif (os[:name] == 'centos') && os[:release].start_with?('8')
package_name = 'mysql-server'
end end
control 'mysql package' do control 'mysql package' do

View file

@ -30,9 +30,10 @@ mysql:
mysqld: mysqld:
# you can use either underscore or hyphen in param names # you can use either underscore or hyphen in param names
bind-address: 0.0.0.0 bind-address: 0.0.0.0
log_bin: /var/log/mysql/mysql-bin.log # log_bin: /var/log/mysql/mysql-bin.log
datadir: /var/lib/mysql datadir: /var/lib/mysql
port: 3307 # port: 3307
# plugin-load-add: auth_socket.so
binlog_do_db: foo binlog_do_db: foo
auto_increment_increment: 5 auto_increment_increment: 5
binlog-ignore-db: binlog-ignore-db:
@ -112,8 +113,6 @@ mysql:
- database: foo - database: foo
grants: ['select', 'insert', 'update'] grants: ['select', 'insert', 'update']
escape: true escape: true
- database: bar
grants: ['all privileges']
# bob: # bob:
# password_hash: '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4' # password_hash: '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'
# host: '%' # Any host # host: '%' # Any host
@ -136,7 +135,7 @@ mysql:
# grants: ['select', 'insert', 'update', 'delete'] # grants: ['select', 'insert', 'update', 'delete']
nopassuser: nopassuser:
password: ~ password: ~
host: localhost # host: localhost # requires unix_socket plugin
databases: [] databases: []
application: application:
password: 'somepass' password: 'somepass'