Merge "Make new functional jobs voting"

jenkins/jobs/neutron.yaml

@@ -186,45 +186,6 @@
       - devstack-logs
       - console-log
 
-- job-template:
-    name: '{pipeline}-neutronclient-dsvm-functional{branch-designator}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 65
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=60
-          export DEVSTACK_GATE_NEUTRON=1
-          export BRANCH_OVERRIDE={branch-override}
-          export DEVSTACK_PROJECT_FROM_GIT=python-neutronclient
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          function post_test_hook {{
-              # Configure and run functional tests
-              $BASE/new/python-neutronclient/neutronclient/tests/functional/hooks/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
-
-# TODO(pcm): Once working, the original template can be removed
 - job-template:
     name: '{pipeline}-neutronclient-test-dsvm-{which-test}{branch-designator}'
     node: '{node}'

jenkins/jobs/projects.yaml

@@ -1738,11 +1738,6 @@
       - openstack-publish-jobs
       - pypi-jobs
       - 'lib-forward-testing-{name}'
-      - '{pipeline}-neutronclient-dsvm-functional{branch-designator}':
-          pipeline: gate
-          node: 'devstack-precise || devstack-trusty'
-          branch-designator: ''
-          branch-override: default
       - '{pipeline}-neutronclient-test-dsvm-{which-test}{branch-designator}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'

zuul/layout.yaml

@@ -1802,15 +1802,10 @@ jobs:
   - name: ^gate-cliff-tox-(openstackclient|neutronclient)-tip$
     branch: ^master$
 
-  # Skip Juno for neutronclient-dsvm-functional
-  - name: ^gate-neutronclient-dsvm-functional$
-    branch: ^(?!stable/juno).*$
-
   # Skip Juno for neutronclient-test-dsvm-functional and
   # neutronclient-test-dsvm-functional-adv-svcs
   - name: ^gate-neutronclient-test-dsvm-functional.*$
     branch: ^(?!stable/juno).*$
-    voting: false
 
   - name: ^gate-ironic-inspector-dsvm.*$
     branch: ^(?!stable/1).*$
@@ -3595,11 +3590,11 @@ projects:
       - name: pypy-jobs
       - name: lib-forward-testing
     check:
-      - gate-neutronclient-dsvm-functional
       - gate-neutronclient-test-dsvm-functional
       - gate-neutronclient-test-dsvm-functional-adv-svcs
     gate:
-      - gate-neutronclient-dsvm-functional
+      - gate-neutronclient-test-dsvm-functional
+      - gate-neutronclient-test-dsvm-functional-adv-svcs
     post:
       - python-neutronclient-coverage
     experimental: