From 1fe9d3129500a8b81bbd5d29f721a4e49db09605 Mon Sep 17 00:00:00 2001
From: Lance Albertson <lance@osuosl.org>
Date: Thu, 27 Feb 2020 16:00:09 -0800
Subject: [PATCH] Update tests for using newer mariadb cookbook

This updates the integration tests for the ops-database cookbook so that
it works properly with the new mariadb cookbook. In addition:

- Enable auto_correct for forwarded_port so we can run more than one
  instance at a time with test-kitchen
- Remove mariadb attributes that are no longer needed
- Temporarily disable voting on centos/ubuntu gates since this will
  require a patch from ops-database and we cannot create a circular
  dependency

Depends-On: https://review.opendev.org/710348
Change-Id: I215a777d255b4b5f9a3481f782a2b7b89f9c3a07
---
 .kitchen.yml                                              | 2 +-
 .zuul.yaml                                                | 3 +++
 environments/allinone.json                                | 8 --------
 environments/integration.json                             | 8 --------
 environments/multinode.json                               | 8 --------
 test/integration/ops-database/inspec/ops_database_spec.rb | 8 +++-----
 6 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/.kitchen.yml b/.kitchen.yml
index 1f2fcaa..351d4d4 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -8,7 +8,7 @@ driver:
     cpus: 4
     memory: 8192
   network:
-  - ["forwarded_port", {guest: 443, host: 9443}]
+  - ["forwarded_port", {guest: 443, host: 9443, auto_correct: true}]
   - ["private_network", {ip: <%= public_ip %>}]
 
 provisioner:
diff --git a/.zuul.yaml b/.zuul.yaml
index 56369cf..ff0235b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,6 +6,7 @@
     pre-run: playbooks/pre-delivery.yaml
     run: playbooks/delivery.yaml
     timeout: 1800
+    voting: false
 
 - job:
     name: openstack-chef-integration-ubuntu
@@ -17,6 +18,7 @@
     run: playbooks/integration.yaml
     post-run: playbooks/post.yaml
     timeout: 5400
+    voting: false
 
 - job:
     name: openstack-chef-minimal-integration-ubuntu
@@ -40,6 +42,7 @@
     run: playbooks/integration.yaml
     post-run: playbooks/post.yaml
     timeout: 5400
+    voting: false
 
 - job:
     name: openstack-chef-minimal-integration-centos
diff --git a/environments/allinone.json b/environments/allinone.json
index 4b926c2..f29428a 100644
--- a/environments/allinone.json
+++ b/environments/allinone.json
@@ -6,14 +6,6 @@
       "listen": [
 
       ]
-    },
-    "mariadb": {
-      "install": {
-        "version": "10.1"
-      },
-      "apt_repository": {
-        "base_url": "ftp.osuosl.org/pub/mariadb/repo"
-      }
     }
   },
   "override_attributes": {
diff --git a/environments/integration.json b/environments/integration.json
index f89a3fa..9279ae8 100644
--- a/environments/integration.json
+++ b/environments/integration.json
@@ -7,14 +7,6 @@
 
       ]
     },
-    "mariadb": {
-      "install": {
-        "version": "10.1"
-      },
-      "apt_repository": {
-        "base_url": "ftp.osuosl.org/pub/mariadb/repo"
-      }
-    },
     "yum": {
       "epel": {
         "baseurl": "http://epel.osuosl.org/7/$basearch",
diff --git a/environments/multinode.json b/environments/multinode.json
index 3e97636..86bcd50 100644
--- a/environments/multinode.json
+++ b/environments/multinode.json
@@ -5,14 +5,6 @@
       "listen": [
 
       ]
-		},
-    "mariadb": {
-      "install": {
-        "version": "10.1"
-      },
-      "apt_repository": {
-        "base_url": "ftp.osuosl.org/pub/mariadb/repo"
-      }
     }
   },
   "override_attributes": {
diff --git a/test/integration/ops-database/inspec/ops_database_spec.rb b/test/integration/ops-database/inspec/ops_database_spec.rb
index 53f5a2b..90741a4 100644
--- a/test/integration/ops-database/inspec/ops_database_spec.rb
+++ b/test/integration/ops-database/inspec/ops_database_spec.rb
@@ -8,12 +8,10 @@ describe service 'mysql' do
   it { should be_enabled }
 end
 
-my_cnf = os.family == 'redhat' ? '/etc/my.cnf.d/openstack.cnf' : '/etc/mysql/conf.d/openstack.cnf'
-
-describe mysql_conf(my_cnf).params('mysqld') do
-  its('default-storage-engine') { should eq 'InnoDB' }
+describe mysql_conf.params('mysqld') do
+  its('default_storage_engine') { should eq 'InnoDB' }
   its('innodb_autoinc_lock_mode') { should eq '1' }
-  its('innodb_file_per_table') { should eq 'OFF' }
+  its('innodb_file_per_table') { should eq '0' }
   its('innodb_thread_concurrency') { should eq '0' }
   its('innodb_commit_concurrency') { should eq '0' }
   its('innodb_read_io_threads') { should eq '4' }