From cb5295c3a6d79edc0b76a2d0f7988d53b582aad0 Mon Sep 17 00:00:00 2001
From: Sergey Skripnick <sskripnick@mirantis.com>
Date: Fri, 8 Aug 2014 17:18:06 +0300
Subject: [PATCH] Fix rally-gate.sh exit status

Exit status should be set to non-zero if rally sla_check was not
successful. Bash option pipefail save any non-zero exit status
from piped commands.

Changed some default scenarios runners agrument

Remove SLA from 2 non working benchmark scenarios.
Related-Bug: #1354683

Change-Id: I327f23e460737ffe3a4fec42afcfbb387ae81bfb
---
 rally-scenarios/rally.yaml | 16 ++++++----------
 tests_ci/rally-gate.sh     |  7 ++++---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/rally-scenarios/rally.yaml b/rally-scenarios/rally.yaml
index d164ff34f0..daa22520ec 100644
--- a/rally-scenarios/rally.yaml
+++ b/rally-scenarios/rally.yaml
@@ -308,10 +308,8 @@
         counter_type: "cumulative"
       runner:
         type: "constant"
-        times: 200
-        concurrency: 5
-      sla:
-        max_failure_percent: 0
+        times: 20
+        concurrency: 10
 
   CeilometerQueries.create_and_query_alarms:
     -
@@ -328,7 +326,7 @@
         insufficient_data_actions: ["http://localhost:8776/notok"]
       runner:
         type: "constant"
-        times: 10
+        times: 20
         concurrency: 10
       sla:
         max_failure_percent: 0
@@ -347,7 +345,7 @@
         insufficient_data_actions: ["http://localhost:8776/notok"]
       runner:
         type: "constant"
-        times: 10
+        times: 20
         concurrency: 10
       sla:
         max_failure_percent: 0
@@ -361,14 +359,12 @@
         counter_name: "cpu_util"
         counter_type: "gauge"
         counter_unit: "instance"
-        counter_volume: 1.0
+        counter_volume: "1.0"
         resource_id: "resource_id"
       runner:
         type: "constant"
-        times: 10
+        times: 20
         concurrency: 10
-      sla:
-        max_failure_percent: 0
 
   HeatStacks.create_and_list_stack:
     -
diff --git a/tests_ci/rally-gate.sh b/tests_ci/rally-gate.sh
index 9ddee354c2..7d1adf9bc8 100755
--- a/tests_ci/rally-gate.sh
+++ b/tests_ci/rally-gate.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -ex
+#!/bin/bash -ex
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
@@ -30,6 +30,9 @@ if [ -d $EXTRA_DIR ]; then
  touch ~/.rally/extra/fake-image.img
 fi
 
+env
+set -o pipefail
+
 rally use deployment --name devstack
 rally deployment check
 rally show flavors
@@ -46,5 +49,3 @@ gzip -9 rally-plot/results.json
 rally task detailed > rally-plot/detailed.txt
 gzip -9 rally-plot/detailed.txt
 rally task sla_check | tee rally-plot/sla.txt
-env
-