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
This commit is contained in:
parent
cbc1b9bcf4
commit
1fe9d31295
|
@ -8,7 +8,7 @@ driver:
|
||||||
cpus: 4
|
cpus: 4
|
||||||
memory: 8192
|
memory: 8192
|
||||||
network:
|
network:
|
||||||
- ["forwarded_port", {guest: 443, host: 9443}]
|
- ["forwarded_port", {guest: 443, host: 9443, auto_correct: true}]
|
||||||
- ["private_network", {ip: <%= public_ip %>}]
|
- ["private_network", {ip: <%= public_ip %>}]
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
pre-run: playbooks/pre-delivery.yaml
|
pre-run: playbooks/pre-delivery.yaml
|
||||||
run: playbooks/delivery.yaml
|
run: playbooks/delivery.yaml
|
||||||
timeout: 1800
|
timeout: 1800
|
||||||
|
voting: false
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: openstack-chef-integration-ubuntu
|
name: openstack-chef-integration-ubuntu
|
||||||
|
@ -17,6 +18,7 @@
|
||||||
run: playbooks/integration.yaml
|
run: playbooks/integration.yaml
|
||||||
post-run: playbooks/post.yaml
|
post-run: playbooks/post.yaml
|
||||||
timeout: 5400
|
timeout: 5400
|
||||||
|
voting: false
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: openstack-chef-minimal-integration-ubuntu
|
name: openstack-chef-minimal-integration-ubuntu
|
||||||
|
@ -40,6 +42,7 @@
|
||||||
run: playbooks/integration.yaml
|
run: playbooks/integration.yaml
|
||||||
post-run: playbooks/post.yaml
|
post-run: playbooks/post.yaml
|
||||||
timeout: 5400
|
timeout: 5400
|
||||||
|
voting: false
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: openstack-chef-minimal-integration-centos
|
name: openstack-chef-minimal-integration-centos
|
||||||
|
|
|
@ -6,14 +6,6 @@
|
||||||
"listen": [
|
"listen": [
|
||||||
|
|
||||||
]
|
]
|
||||||
},
|
|
||||||
"mariadb": {
|
|
||||||
"install": {
|
|
||||||
"version": "10.1"
|
|
||||||
},
|
|
||||||
"apt_repository": {
|
|
||||||
"base_url": "ftp.osuosl.org/pub/mariadb/repo"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"override_attributes": {
|
"override_attributes": {
|
||||||
|
|
|
@ -7,14 +7,6 @@
|
||||||
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"mariadb": {
|
|
||||||
"install": {
|
|
||||||
"version": "10.1"
|
|
||||||
},
|
|
||||||
"apt_repository": {
|
|
||||||
"base_url": "ftp.osuosl.org/pub/mariadb/repo"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"yum": {
|
"yum": {
|
||||||
"epel": {
|
"epel": {
|
||||||
"baseurl": "http://epel.osuosl.org/7/$basearch",
|
"baseurl": "http://epel.osuosl.org/7/$basearch",
|
||||||
|
|
|
@ -5,14 +5,6 @@
|
||||||
"listen": [
|
"listen": [
|
||||||
|
|
||||||
]
|
]
|
||||||
},
|
|
||||||
"mariadb": {
|
|
||||||
"install": {
|
|
||||||
"version": "10.1"
|
|
||||||
},
|
|
||||||
"apt_repository": {
|
|
||||||
"base_url": "ftp.osuosl.org/pub/mariadb/repo"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"override_attributes": {
|
"override_attributes": {
|
||||||
|
|
|
@ -8,12 +8,10 @@ describe service 'mysql' do
|
||||||
it { should be_enabled }
|
it { should be_enabled }
|
||||||
end
|
end
|
||||||
|
|
||||||
my_cnf = os.family == 'redhat' ? '/etc/my.cnf.d/openstack.cnf' : '/etc/mysql/conf.d/openstack.cnf'
|
describe mysql_conf.params('mysqld') do
|
||||||
|
its('default_storage_engine') { should eq 'InnoDB' }
|
||||||
describe mysql_conf(my_cnf).params('mysqld') do
|
|
||||||
its('default-storage-engine') { should eq 'InnoDB' }
|
|
||||||
its('innodb_autoinc_lock_mode') { should eq '1' }
|
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_thread_concurrency') { should eq '0' }
|
||||||
its('innodb_commit_concurrency') { should eq '0' }
|
its('innodb_commit_concurrency') { should eq '0' }
|
||||||
its('innodb_read_io_threads') { should eq '4' }
|
its('innodb_read_io_threads') { should eq '4' }
|
||||||
|
|
Loading…
Reference in New Issue