From 8034571ff8058f8a23f40cd92ab2220be491abc9 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 19 May 2016 22:24:22 +0200
Subject: [PATCH] scenario001: run Gnocchi tempest tests

* 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
---
 fixtures/scenario001.pp | 5 +++++
 manifests/tempest.pp    | 6 ++++++
 run_tests.sh            | 7 +++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index c966705e0..74bfd8431 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -19,10 +19,14 @@ case $::osfamily {
     $ipv6               = false
     # we need https://review.openstack.org/#/c/318503/ backported in Mitaka / UCA
     $ceilometer_enabled = false
+    # gnocchi is not packaged in Ubuntu Cloud Archive
+    # https://bugs.launchpad.net/cloud-archive/+bug/1535740
+    $gnocchi_enabled    = false
   }
   'RedHat': {
     $ipv6               = true
     $ceilometer_enabled = true
+    $gnocchi_enabled    = true
   }
   default: {
     fail("Unsupported osfamily (${::osfamily})")
@@ -77,4 +81,5 @@ class { '::openstack_integration::tempest':
   cinder     => true,
   ceilometer => $ceilometer_enabled,
   aodh       => $ceilometer_enabled,
+  gnocchi    => $gnocchi_enabled,
 }
diff --git a/manifests/tempest.pp b/manifests/tempest.pp
index 55ce71691..41bc035c4 100644
--- a/manifests/tempest.pp
+++ b/manifests/tempest.pp
@@ -16,6 +16,10 @@
 #   (optional) Define if Glance needs to be tested.
 #   Default to true.
 #
+# [*gnocchi*]
+#   (optional) Define if Gnocchi needs to be tested.
+#   Default to false.
+#
 # [*heat*]
 #   (optional) Define if Heat needs to be tested.
 #   Default to false.
@@ -61,6 +65,7 @@ class openstack_integration::tempest (
   $ceilometer = false,
   $cinder     = false,
   $glance     = true,
+  $gnocchi    = false,
   $heat       = false,
   $horizon    = false,
   $ironic     = false,
@@ -118,6 +123,7 @@ class openstack_integration::tempest (
     ironic_available       => $ironic,
     zaqar_available        => $zaqar,
     mistral_available      => $mistral,
+    gnocchi_available      => $gnocchi,
     public_network_name    => 'public',
     dashboard_url          => $::openstack_integration::config::base_url,
     flavor_ref             => '42',
diff --git a/run_tests.sh b/run_tests.sh
index 585e4ef9d..2e487c51f 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -135,10 +135,6 @@ fi
 # Tempest plugin tests require tempest-lib to be installed
 $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
 # Select what to test:
 # Smoke suite
@@ -150,6 +146,9 @@ TESTS="${TESTS} dashboard"
 # Aodh
 TESTS="${TESTS} TelemetryAlarming"
 
+# Gnocchi
+TESTS="${TESTS} gnocchi.tempest"
+
 # Ironic
 # Note: running all Ironic tests under SSL is not working
 # https://bugs.launchpad.net/ironic/+bug/1554237