Merge "Rename osc-functional to osc-dsvm-functional"

modules/openstack_project/files/jenkins_job_builder/config/osc-functional.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-osc-functional{branch-designator}'
+    name: '{pipeline}-osc-dsvm-functional{branch-designator}'
     node: '{node}'
 
     wrappers:

modules/openstack_project/files/jenkins_job_builder/config/projects.yaml

@@ -1276,12 +1276,12 @@
 
     jobs:
       - python-jobs
-      - '{pipeline}-osc-functional{branch-designator}':
+      - '{pipeline}-osc-dsvm-functional{branch-designator}':
           pipeline: check
           node: 'devstack-precise || devstack-trusty'
           branch-designator: ''
           branch-override: default
-      - '{pipeline}-osc-functional{branch-designator}':
+      - '{pipeline}-osc-dsvm-functional{branch-designator}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
           branch-designator: ''

modules/openstack_project/files/zuul/layout.yaml

@@ -788,7 +788,7 @@ jobs:
     voting: false
 
   # TODO(stevemar): Enable voting when we have some basic coverage
-  - name: ^(gate|check)-osc-functional
+  - name: ^(gate|check)-osc-dsvm-functional
     voting: false
   - name: gate-horizon-dsvm-integration
     branch: ^(?!stable/(havana|icehouse)).*$
@@ -1761,9 +1761,9 @@ projects:
       - name: stable-compat-jobs
       - name: publish-to-pypi
     check:
-      - check-osc-functional
+      - check-osc-dsvm-functional
     gate:
-      - gate-osc-functional
+      - gate-osc-dsvm-functional
 
   - name: openstack/python-saharaclient
     template: