Add cinder storage to CI

create and attach a volume during the test
also added databag for orchestration secret

Change-Id: I97ba0776858b16257b91668fdc9515ffe604c3d1
This commit is contained in:
Mark Vanderwiel 2015-07-22 10:29:59 -05:00
parent 84dfc3dc33
commit 51f8555d1e
2 changed files with 24 additions and 4 deletions

View File

@ -109,12 +109,15 @@ end
# Helper for setting up basic nova tests
def _run_nova_tests # rubocop:disable Metrics/MethodLength
_run_commands('nova boot tests', {
'nova' => ['boot test --image cirros --flavor 1'],
uuid = `sudo bash -c '. /root/openrc && cinder list | grep test_volume | cut -d " " -f 2'`
_run_commands('nova boot tests pre', {
'nova' => ['list', "boot test --image cirros --flavor 1 --block-device-mapping vdb=#{uuid.chomp!}:::1"],
'sleep' => ['25'] }
)
_run_commands('nova boot tests', {
'nova' => ['list', 'show test', 'delete test'] }
_run_commands('nova boot tests post', {
'nova' => ['list', 'show test', 'delete test'],
'sleep' => ['25'],
'cinder' => ['list'] }
)
end
@ -126,6 +129,13 @@ def _setup_local_network # rubocop:disable Metrics/MethodLength
)
end
# Helper for setting up cinder storage volume
def _setup_cinder_volume # rubocop:disable Metrics/MethodLength
_run_commands('cinder storage volume setup', {
'cinder' => ['create --display_name test_volume 1'] }
)
end
desc "Integration test on Infra"
task :integration => [:create_key, :berks_vendor] do
# This is a workaround for allowing chef-client to run in local mode
@ -139,6 +149,7 @@ task :integration => [:create_key, :berks_vendor] do
sh %(sudo chef-client --force-formatter -z -E integration-aio-neutron -r 'role[allinone-compute]','role[os-image-upload]','recipe[openstack-integration-test::setup]')
_setup_local_network if i == 1
_run_basic_queries
_setup_cinder_volume
_run_nova_tests
end
# Run the tempest formal tests, setup with the openstack-integration-test cookbook

View File

@ -0,0 +1,9 @@
{
"id": "orchestration_auth_encryption_key",
"orchestration_auth_encryption_key": {
"encrypted_data": "CBp5793jSaWQkR1rujPamHqbDYSYFUZCyarZE5drTMIi3qsEEwnc7CLJIB5h\n21JTi9T97j8Pax7czVNALpX0Zg==\n",
"iv": "0uiMgFPcEn2hjWGQP7D8uw==\n",
"version": 1,
"cipher": "aes-256-cbc"
}
}