From a1f198ec88edff082da26e855dd1481bb621a109 Mon Sep 17 00:00:00 2001
From: Boris Pavlovic <boris@pavlovic.me>
Date: Thu, 14 Apr 2016 17:08:11 -0700
Subject: [PATCH] [CI] Move cinder scenarios to cinder job from
 neutron_unstable

We have separated non voting cinder job that should test all cinder
plugins. Previously it was in neutron_unstalbe job that was used
for all unstable scenarios, so they won't block the gates.

Change-Id: I7329190031d265002b7e286cee1dcb462d94125e
---
 rally-jobs/cinder.yaml           | 32 ++++++++++-
 rally-jobs/unstable-neutron.yaml | 96 --------------------------------
 2 files changed, 29 insertions(+), 99 deletions(-)

diff --git a/rally-jobs/cinder.yaml b/rally-jobs/cinder.yaml
index a8c39ecf36..e3ce28828b 100644
--- a/rally-jobs/cinder.yaml
+++ b/rally-jobs/cinder.yaml
@@ -1,4 +1,5 @@
 {% set image_name = "^(cirros.*uec|TestVM)$" %}
+{% set flavor_name = "m1.tiny" %}
 ---
   Authenticate.validate_cinder:
     -
@@ -362,7 +363,7 @@
         image:
           name: {{image_name}}
         flavor:
-          name: "m1.tiny"
+          name: {{flavor_name}}
       runner:
         type: "constant"
         times: 2
@@ -394,7 +395,7 @@
           image:
             name: {{image_name}}
           flavor:
-            name: "m1.tiny"
+            name: {{flavor_name}}
           servers_per_tenant: 1
       sla:
         failure_rate:
@@ -418,7 +419,7 @@
           image:
             name: {{image_name}}
           flavor:
-            name: "m1.tiny"
+            name: {{flavor_name}}
           servers_per_tenant: 1
       sla:
         failure_rate:
@@ -586,3 +587,28 @@
       sla:
         failure_rate:
           max: 0
+
+  CinderVolumes.create_nested_snapshots_and_attach_volume:
+    -
+      args:
+          size:
+              min: 1
+              max: 1
+          nested_level: 2
+      runner:
+        type: "constant"
+        times: 2
+        concurrency: 2
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 1
+        servers:
+          image:
+            name: {{image_name}}
+          flavor:
+            name: {{flavor_name}}
+          servers_per_tenant: 2
+      sla:
+          failure_rate:
+            max: 0
diff --git a/rally-jobs/unstable-neutron.yaml b/rally-jobs/unstable-neutron.yaml
index 9c2224baf1..db97f6622d 100644
--- a/rally-jobs/unstable-neutron.yaml
+++ b/rally-jobs/unstable-neutron.yaml
@@ -70,102 +70,6 @@
         failure_rate:
           max: 0
 
-  CinderVolumes.create_and_attach_volume:
-    -
-      args:
-        size: 1
-        image:
-          name: {{image_name}}
-        flavor:
-          name: {{flavor_name}}
-      runner:
-        type: "constant"
-        times: 3
-        concurrency: 3
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.create_snapshot_and_attach_volume:
-    -
-      args:
-          volume_type: false
-          size:
-              min: 1
-              max: 1
-      runner:
-        type: "constant"
-        times: 3
-        concurrency: 3
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 1
-        servers:
-          image:
-            name: {{image_name}}
-          flavor:
-            name: {{flavor_name}}
-          servers_per_tenant: 2
-      sla:
-          failure_rate:
-            max: 0
-    -
-      args:
-          volume_type: true
-          size:
-              min: 1
-              max: 1
-      runner:
-        type: "constant"
-        times: 3
-        concurrency: 3
-      context:
-        users:
-          tenants: 1
-          users_per_tenant: 1
-        servers:
-          image:
-            name: {{image_name}}
-          flavor:
-            name: {{flavor_name}}
-          servers_per_tenant: 1
-      sla:
-          failure_rate:
-            max: 0
-
-
-  CinderVolumes.create_nested_snapshots_and_attach_volume:
-    -
-      args:
-          size:
-              min: 1
-              max: 1
-          nested_level:
-              min: 2
-              max: 2
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 1
-        servers:
-          image:
-            name: {{image_name}}
-          flavor:
-            name: {{flavor_name}}
-          servers_per_tenant: 2
-      sla:
-          failure_rate:
-            max: 0
-
   CeilometerResource.get_tenant_resources:
     -
       runner: