Remove senlin-dsvm-functional gate job

This patch removes senlin-dsvm-functional gate job which has
been replaced by senlin-dsvm-tempest-functional. It also adds
senlin-dsvm-tempest-functional job to both check and gate
pipelines and makes it vote.

Change-Id: I7e7de9f8f4e44d485160820f8788f657f26c1d3b

jenkins/jobs/projects.yaml

@@ -8893,11 +8893,6 @@
     jobs:
       - python-jobs
       - gate-rally-dsvm-senlin-{name}
-      - '{pipeline}-senlin-dsvm-functional{job-suffix}':
-          pipeline: gate
-          node: ubuntu-trusty
-          job-suffix: ''
-          branch-override: default
       - '{pipeline}-senlin-dsvm-tempest-{test_type}{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty

jenkins/jobs/senlin.yaml

@@ -1,48 +1,3 @@
-- job-template:
-    name: '{pipeline}-senlin-dsvm-functional{job-suffix}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 130
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export BRANCH_OVERRIDE={branch-override}
-          export PROJECTS="openstack/senlin $PROJECTS"
-          export PROJECTS="openstack/senlin-dashboard $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service sl-api sl-eng"
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          function pre_test_hook {{
-              cd /opt/stack/new/senlin/senlin/tests/functional/
-              ./pre_test_hook.sh
-          }}
-          export -f pre_test_hook
-
-          function post_test_hook {{
-              cd /opt/stack/new/senlin/senlin/tests/functional/
-              ./post_test_hook.sh
-          }}
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-
-    publishers:
-      - test-results
-      - devstack-logs
-      - console-log
-
 - job-template:
     name: '{pipeline}-senlin-dsvm-tempest-{test_type}{job-suffix}'
     node: '{node}'

zuul/layout.yaml

@@ -2732,12 +2732,8 @@ jobs:
   - name: ^gate-grenade-dsvm-ironic
     branch: ^(?!stable/(liberty|mitaka)).*$
 
-  - name: gate-senlin-dsvm-functional
-    voting: false
-
   - name: gate-senlin-dsvm-tempest-functional
     branch: ^(?!stable/mitaka).*$
-    voting: false
 
   - name: gate-senlin-dsvm-tempest-api
     branch: ^(?!stable/mitaka).*$
@@ -11569,12 +11565,12 @@ projects:
       - name: api-ref-jobs
     check:
       - gate-senlin-dsvm-tempest-api
+      - gate-senlin-dsvm-tempest-functional
     gate:
       - gate-senlin-dsvm-tempest-api
-    experimental:
-      - gate-senlin-dsvm-functional
-      - gate-rally-dsvm-senlin-senlin
       - gate-senlin-dsvm-tempest-functional
+    experimental:
+      - gate-rally-dsvm-senlin-senlin
 
   - name: openstack/senlin-dashboard
     template: