From 54f597cf434301a8d9889b65aab94dee5993e090 Mon Sep 17 00:00:00 2001
From: chenhb-zte <chen.haibing1@zte.com.cn>
Date: Mon, 6 Feb 2017 18:54:12 +0800
Subject: [PATCH] Change volumes size or time of cind ci

create_and_extend_volume and create_and_get_volume scenarios are
often failed, because the status error.
Maybe, it is the reason that there is not enough disk space left,
we try it.
Move create_volume to the first scenario, and reduce the concurrency
and times to avoid image volumes which be created more times.

Change-Id: I9c398effa0bbfdc693ac1197c4dc671e1f5e778a
---
 rally-jobs/cinder.yaml | 104 ++++++++++++++++++++---------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/rally-jobs/cinder.yaml b/rally-jobs/cinder.yaml
index 2deb5b54..7aa08811 100755
--- a/rally-jobs/cinder.yaml
+++ b/rally-jobs/cinder.yaml
@@ -1,6 +1,54 @@
 {% set image_name = "^(cirros.*-disk|TestVM)$" %}
 {% set flavor_name = "m1.tiny" %}
 ---
+  CinderVolumes.create_volume:
+    -
+      args:
+        size: 1
+      runner:
+        type: "constant"
+        times: 2
+        concurrency: 2
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 2
+      sla:
+        failure_rate:
+          max: 0
+    -
+      args:
+        size:
+          min: 1
+          max: 2
+      runner:
+        type: "constant"
+        times: 2
+        concurrency: 2
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 2
+      sla:
+        failure_rate:
+          max: 0
+    -
+      args:
+        size: 1
+        image:
+          name: {{image_name}}
+      runner:
+        type: "constant"
+        times: 1
+        concurrency: 1
+      context:
+        users:
+          tenants: 1
+          users_per_tenant: 1
+      sla:
+        failure_rate:
+          max: 0
+
   Authenticate.validate_cinder:
     -
       args:
@@ -108,8 +156,8 @@
           name: "image-context-test"
       runner:
         type: "constant"
-        times: 2
-        concurrency: 2
+        times: 1
+        concurrency: 1
       context:
         users:
           tenants: 1
@@ -270,10 +318,10 @@
       args:
         size:
           min: 1
-          max: 3
+          max: 2
       runner:
         type: "constant"
-        times: 5
+        times: 2
         concurrency: 2
       context:
         users:
@@ -336,54 +384,6 @@
           max: 0
   {% endfor %}
 
-  CinderVolumes.create_volume:
-    -
-      args:
-        size: 1
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-      sla:
-        failure_rate:
-          max: 0
-    -
-      args:
-        size:
-          min: 1
-          max: 3
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-      sla:
-        failure_rate:
-          max: 0
-    -
-      args:
-        size: 1
-        image:
-          name: {{image_name}}
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-      sla:
-        failure_rate:
-          max: 0
-
   CinderVolumes.create_and_accept_transfer:
     -
       args: