Merge "Rename Zuul jobs"

.zuul.yaml

@@ -22,11 +22,11 @@
             voting: false
         - manila-tempest-minimal-dsvm-dummy
         - manila-tempest-minimal-dsvm-lvm-centos-7
-        - grenade-dsvm-manila:
+        - manila-grenade:
             voting: false
-        - rally-dsvm-manila-multibackend:
+        - manila-rally-multibackend:
             voting: false
-        - rally-dsvm-manila-multibackend-no-ss:
+        - manila-rally-multibackend-no-ss:
             voting: false
     gate:
       jobs:
@@ -41,7 +41,7 @@
         - manila-tempest-dsvm-glusterfs-native-heketi
 
 - job:
-    name: grenade-dsvm-manila
+    name: manila-grenade
     parent: legacy-dsvm-base
     run: playbooks/legacy/grenade-dsvm-manila/run.yaml
     post-run: playbooks/legacy/grenade-dsvm-manila/post.yaml
@@ -66,7 +66,7 @@
       - openstack/python-manilaclient
 
 - job:
-    name: legacy-manila-tempest-dsvm-base
+    name: manila-tempest-base
     parent: legacy-dsvm-base
     irrelevant-files:
       - ^(test-|)requirements.txt$
@@ -84,7 +84,7 @@
 
 - job:
     name: manila-tempest-dsvm-container-scenario-custom-image
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml
     post-run: playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml
     timeout: 5400
@@ -98,7 +98,7 @@
 
 - job:
     name: manila-tempest-dsvm-generic-no-share-servers
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
     post-run: playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml
     timeout: 5400
@@ -112,7 +112,7 @@
 
 - job:
     name: manila-tempest-dsvm-generic-scenario-custom-image
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml
     post-run: playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml
     timeout: 5400
@@ -126,7 +126,7 @@
 
 - job:
     name: manila-tempest-dsvm-glusterfs-native
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml
     post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml
     timeout: 4800
@@ -140,7 +140,7 @@
 
 - job:
     name: manila-tempest-dsvm-glusterfs-native-heketi
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml
     post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml
     timeout: 4800
@@ -154,7 +154,7 @@
 
 - job:
     name: manila-tempest-dsvm-glusterfs-nfs
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml
     post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml
     timeout: 4800
@@ -168,7 +168,7 @@
 
 - job:
     name: manila-tempest-dsvm-glusterfs-nfs-heketi
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml
     post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml
     timeout: 4800
@@ -182,7 +182,7 @@
 
 - job:
     name: manila-tempest-dsvm-hdfs
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml
     post-run: playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml
     timeout: 4800
@@ -196,7 +196,7 @@
 
 - job:
     name: manila-tempest-dsvm-mysql-generic
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
     post-run: playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml
     timeout: 5400
@@ -210,7 +210,7 @@
 
 - job:
     name: manila-tempest-dsvm-postgres-container
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
     post-run: playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml
     timeout: 5400
@@ -224,7 +224,7 @@
 
 - job:
     name: manila-tempest-dsvm-postgres-generic-singlebackend
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
     post-run: playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml
     timeout: 5400
@@ -238,7 +238,7 @@
 
 - job:
     name: manila-tempest-dsvm-postgres-zfsonlinux
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
     post-run: playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml
     timeout: 5400
@@ -252,7 +252,7 @@
 
 - job:
     name: manila-tempest-dsvm-scenario
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
     post-run: playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml
     timeout: 5400
@@ -266,7 +266,7 @@
 
 - job:
     name: manila-tempest-minimal-dsvm-cephfs-native-centos-7
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml
     post-run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/post.yaml
     timeout: 5400
@@ -281,7 +281,7 @@
 
 - job:
     name: manila-tempest-minimal-dsvm-cephfs-nfs-centos-7
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml
     post-run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/post.yaml
     timeout: 5400
@@ -296,7 +296,7 @@
 
 - job:
     name: manila-tempest-minimal-dsvm-dummy
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
     post-run: playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml
     timeout: 5400
@@ -309,7 +309,7 @@
 
 - job:
     name: manila-tempest-minimal-dsvm-lvm-centos-7
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml
     post-run: playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/post.yaml
     timeout: 5400
@@ -324,7 +324,7 @@
 
 - job:
     name: manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml
     post-run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/post.yaml
     timeout: 5400
@@ -339,7 +339,7 @@
 
 - job:
     name: manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7
-    parent: legacy-manila-tempest-dsvm-base
+    parent: manila-tempest-base
     run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml
     post-run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/post.yaml
     timeout: 5400
@@ -363,7 +363,7 @@
       tox_envlist: genconfig
 
 - job:
-    name: rally-dsvm-manila-multibackend
+    name: manila-rally-multibackend
     parent: legacy-dsvm-base
     run: playbooks/legacy/rally-dsvm-manila-multibackend/run.yaml
     post-run: playbooks/legacy/rally-dsvm-manila-multibackend/post.yaml
@@ -386,7 +386,7 @@
       - openstack/rally
 
 - job:
-    name: rally-dsvm-manila-multibackend-no-ss
+    name: manila-rally-multibackend-no-ss
     parent: legacy-dsvm-base
     run: playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/run.yaml
     post-run: playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml