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
This commit is contained in:
Sergey Skripnick
2014-08-08 17:18:06 +03:00
committed by Boris Pavlovic
parent 767d4424d8
commit cb5295c3a6
2 changed files with 10 additions and 13 deletions

View File

@@ -308,10 +308,8 @@
counter_type: "cumulative" counter_type: "cumulative"
runner: runner:
type: "constant" type: "constant"
times: 200 times: 20
concurrency: 5 concurrency: 10
sla:
max_failure_percent: 0
CeilometerQueries.create_and_query_alarms: CeilometerQueries.create_and_query_alarms:
- -
@@ -328,7 +326,7 @@
insufficient_data_actions: ["http://localhost:8776/notok"] insufficient_data_actions: ["http://localhost:8776/notok"]
runner: runner:
type: "constant" type: "constant"
times: 10 times: 20
concurrency: 10 concurrency: 10
sla: sla:
max_failure_percent: 0 max_failure_percent: 0
@@ -347,7 +345,7 @@
insufficient_data_actions: ["http://localhost:8776/notok"] insufficient_data_actions: ["http://localhost:8776/notok"]
runner: runner:
type: "constant" type: "constant"
times: 10 times: 20
concurrency: 10 concurrency: 10
sla: sla:
max_failure_percent: 0 max_failure_percent: 0
@@ -361,14 +359,12 @@
counter_name: "cpu_util" counter_name: "cpu_util"
counter_type: "gauge" counter_type: "gauge"
counter_unit: "instance" counter_unit: "instance"
counter_volume: 1.0 counter_volume: "1.0"
resource_id: "resource_id" resource_id: "resource_id"
runner: runner:
type: "constant" type: "constant"
times: 10 times: 20
concurrency: 10 concurrency: 10
sla:
max_failure_percent: 0
HeatStacks.create_and_list_stack: HeatStacks.create_and_list_stack:
- -

View File

@@ -1,4 +1,4 @@
#!/bin/sh -ex #!/bin/bash -ex
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # 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 # 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 touch ~/.rally/extra/fake-image.img
fi fi
env
set -o pipefail
rally use deployment --name devstack rally use deployment --name devstack
rally deployment check rally deployment check
rally show flavors rally show flavors
@@ -46,5 +49,3 @@ gzip -9 rally-plot/results.json
rally task detailed > rally-plot/detailed.txt rally task detailed > rally-plot/detailed.txt
gzip -9 rally-plot/detailed.txt gzip -9 rally-plot/detailed.txt
rally task sla_check | tee rally-plot/sla.txt rally task sla_check | tee rally-plot/sla.txt
env