From 060b43f3036bbdfd1c0910fe91ff280221ef116c Mon Sep 17 00:00:00 2001
From: noelmcloughlin <noel.mcloughlin@gmail.com>
Date: Thu, 10 Jun 2021 00:24:06 +0100
Subject: [PATCH] ci(centos): add centos ci; fix test pillar

---
 .gitlab-ci.yml                                     | 4 ++--
 test/integration/default/controls/packages_spec.rb | 2 ++
 test/salt/pillar/mysql.sls                         | 9 ++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 032ee4f..7354670 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -138,8 +138,8 @@ default-debian-9-master-py3: {extends: '.test_instance'}
 default-ubuntu-2004-master-py3: {extends: '.test_instance'}
 default-ubuntu-1804-master-py3: {extends: '.test_instance'}
 default-ubuntu-1604-master-py3: {extends: '.test_instance'}
-# default-centos-8-master-py3: {extends: '.test_instance'}
-# default-centos-7-master-py3: {extends: '.test_instance'}
+default-centos-8-master-py3: {extends: '.test_instance'}
+default-centos-7-master-py3: {extends: '.test_instance'}
 # default-fedora-34-master-py3: {extends: '.test_instance'}
 # default-fedora-33-master-py3: {extends: '.test_instance'}
 # default-fedora-32-master-py3: {extends: '.test_instance'}
diff --git a/test/integration/default/controls/packages_spec.rb b/test/integration/default/controls/packages_spec.rb
index 288f3d6..e58519f 100644
--- a/test/integration/default/controls/packages_spec.rb
+++ b/test/integration/default/controls/packages_spec.rb
@@ -6,6 +6,8 @@ if (os[:name] == 'suse') || (os[:name] == 'opensuse')
   package_name = 'mariadb'
 elsif (os[:name] == 'debian') && os[:release].start_with?('8')
   package_name = 'mysql-server'
+elsif (os[:name] == 'centos') && os[:release].start_with?('8')
+  package_name = 'mysql-server'
 end
 
 control 'mysql package' do
diff --git a/test/salt/pillar/mysql.sls b/test/salt/pillar/mysql.sls
index 17a3124..f89cd95 100644
--- a/test/salt/pillar/mysql.sls
+++ b/test/salt/pillar/mysql.sls
@@ -30,9 +30,10 @@ mysql:
     mysqld:
       # you can use either underscore or hyphen in param names
       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
-      port: 3307
+      # port: 3307
+      # plugin-load-add: auth_socket.so
       binlog_do_db: foo
       auto_increment_increment: 5
       binlog-ignore-db:
@@ -112,8 +113,6 @@ mysql:
         - database: foo
           grants: ['select', 'insert', 'update']
           escape: true
-        - database: bar
-          grants: ['all privileges']
     # bob:
     #   password_hash: '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'
     #   host: '%' # Any host
@@ -136,7 +135,7 @@ mysql:
     #       grants: ['select', 'insert', 'update', 'delete']
     nopassuser:
       password: ~
-      host: localhost
+      # host: localhost  # requires unix_socket plugin
       databases: []
     application:
       password: 'somepass'