Skip to content

Commit

Permalink
Fix rally-gate.sh exit status
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Sergey Skripnick authored and boris-42 committed Aug 9, 2014
1 parent 767d442 commit cb5295c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
16 changes: 6 additions & 10 deletions rally-scenarios/rally.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
-
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
-
Expand Down
7 changes: 4 additions & 3 deletions tests_ci/rally-gate.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

0 comments on commit cb5295c

Please sign in to comment.