Update jenkins jobs for Scalpels

This patch applies both ubuntu and fedora dsvm in scalpels' CI.

Change-Id: I07e7d57c38a0a27e2264e914eab11c5d7e244ccc

jenkins/jobs/projects.yaml

@@ -6104,9 +6104,14 @@
     jobs:
       - python-jobs
       - pypi-jobs
-      - '{pipeline}-scalpels-dsvm-neutron{job-suffix}':
+      - '{pipeline}-scalpels-dsvm-neutron{job-suffix}-{ostype}':
+          ostype: 'devstack-trusty'
+          pipeline: gate
+          job-suffix: ''
+          branch-override: default
+      - '{pipeline}-scalpels-dsvm-neutron{job-suffix}-{ostype}':
+          ostype: 'fedora-22'
           pipeline: gate
-          node: 'devstack-precise || devstack-trusty'
           job-suffix: ''
           branch-override: default
 

jenkins/jobs/scalpels.yaml

@@ -1,6 +1,6 @@
 - job-template:
-    name: '{pipeline}-scalpels-dsvm-neutron{job-suffix}'
-    node: '{node}'
+    name: '{pipeline}-scalpels-dsvm-neutron{job-suffix}-{ostype}'
+    node: '{ostype}'
 
     wrappers:
       - build-timeout:

zuul/layout.yaml

@@ -2026,7 +2026,10 @@ jobs:
   - name: gate-senlin-dsvm-functional
     voting: false
 
-  - name: gate-scalpels-dsvm-neutron
+  - name: gate-scalpels-dsvm-neutron-devstack-trusty
+    voting: false
+
+  - name: gate-scalpels-dsvm-neutron-fedora-22
     voting: false
 
   - name: gate-python-cueclient-python34
@@ -8420,7 +8423,8 @@ projects:
       - name: check-requirements
       - name: publish-to-pypi
     experimental:
-      - gate-scalpels-dsvm-neutron
+      - gate-scalpels-dsvm-neutron-devstack-trusty
+      - gate-scalpels-dsvm-neutron-fedora-22
 
   - name: openstack/searchlight
     template: