openstack/puppet-openstack-integration
Code Issues Proposed changes

scenario001: run Gnocchi tempest tests

Browse Source 
* drop workaround to deploy Gabbi from pip, and use RDO package.
* Add gnocchi in the Puppet Tempest interface.
* Add gnocchi tests in the list of tests we want to run.

Change-Id: I51094b28c42f7c64d4357f49d0932e027cbd6310
This commit is contained in:
Emilien Macchi 2016-05-19 22:24:22 +02:00
parent 04e82b16cf
commit 8034571ff8
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fixtures/scenario001.pp
View File

@ -19,10 +19,14 @@ case $::osfamily {
$ipv6 = false $ipv6 = false
# we need https://review.openstack.org/#/c/318503/ backported in Mitaka / UCA # we need https://review.openstack.org/#/c/318503/ backported in Mitaka / UCA
$ceilometer_enabled = false $ceilometer_enabled = false
# gnocchi is not packaged in Ubuntu Cloud Archive
# https://bugs.launchpad.net/cloud-archive/+bug/1535740
$gnocchi_enabled = false
} }
'RedHat': { 'RedHat': {
$ipv6 = true $ipv6 = true
$ceilometer_enabled = true $ceilometer_enabled = true
$gnocchi_enabled = true
} }
default: { default: {
fail("Unsupported osfamily (${::osfamily})") fail("Unsupported osfamily (${::osfamily})")
@ -77,4 +81,5 @@ class { '::openstack_integration::tempest':
cinder => true, cinder => true,
ceilometer => $ceilometer_enabled, ceilometer => $ceilometer_enabled,
aodh => $ceilometer_enabled, aodh => $ceilometer_enabled,
gnocchi => $gnocchi_enabled,
} }

6
manifests/tempest.pp
View File

@ -16,6 +16,10 @@
# (optional) Define if Glance needs to be tested. # (optional) Define if Glance needs to be tested.
# Default to true. # Default to true.
# #
# [*gnocchi*]
# (optional) Define if Gnocchi needs to be tested.
# Default to false.
#
# [*heat*] # [*heat*]
# (optional) Define if Heat needs to be tested. # (optional) Define if Heat needs to be tested.
# Default to false. # Default to false.
@ -61,6 +65,7 @@ class openstack_integration::tempest (
$ceilometer = false, $ceilometer = false,
$cinder = false, $cinder = false,
$glance = true, $glance = true,
$gnocchi = false,
$heat = false, $heat = false,
$horizon = false, $horizon = false,
$ironic = false, $ironic = false,
@ -118,6 +123,7 @@ class openstack_integration::tempest (
ironic_available => $ironic, ironic_available => $ironic,
zaqar_available => $zaqar, zaqar_available => $zaqar,
mistral_available => $mistral, mistral_available => $mistral,
gnocchi_available => $gnocchi,
public_network_name => 'public', public_network_name => 'public',
dashboard_url => $::openstack_integration::config::base_url, dashboard_url => $::openstack_integration::config::base_url,
flavor_ref => '42', flavor_ref => '42',

7
run_tests.sh
View File

@ -135,10 +135,6 @@ fi
# Tempest plugin tests require tempest-lib to be installed # Tempest plugin tests require tempest-lib to be installed
$SUDO pip install tempest-lib $SUDO pip install tempest-lib
# Install Gabbi with pip until it's packaged in RDO:
# https://bugzilla.redhat.com/show_bug.cgi?id=1252812
$SUDO pip install gabbi
set +e set +e
# Select what to test: # Select what to test:
# Smoke suite # Smoke suite
@ -150,6 +146,9 @@ TESTS="${TESTS} dashboard"
# Aodh # Aodh
TESTS="${TESTS} TelemetryAlarming" TESTS="${TESTS} TelemetryAlarming"
# Gnocchi
TESTS="${TESTS} gnocchi.tempest"
# Ironic # Ironic
# Note: running all Ironic tests under SSL is not working # Note: running all Ironic tests under SSL is not working
# https://bugs.launchpad.net/ironic/+bug/1554237 # https://bugs.launchpad.net/ironic/+bug/1554237