Run shade functional tests on neutron and nova-net

We have clouds in the wild that do both - so we should test that we do
the right thing on both.

Change-Id: Ib4092299e1258ae7c8f75af104806cebc8d10e52

jenkins/jobs/projects.yaml

@@ -2974,12 +2974,22 @@
       - python-jobs
       - pypi-jobs
       - infra-publish-jobs
-      - '{pipeline}-shade-dsvm-functional{branch-designator}':
+      - '{pipeline}-shade-dsvm-functional-neutron{branch-designator}':
           pipeline: check
           node: 'devstack-precise || devstack-trusty'
           branch-designator: ''
           branch-override: default
-      - '{pipeline}-shade-dsvm-functional{branch-designator}':
+      - '{pipeline}-shade-dsvm-functional-nova{branch-designator}':
+          pipeline: check
+          node: 'devstack-precise || devstack-trusty'
+          branch-designator: ''
+          branch-override: default
+      - '{pipeline}-shade-dsvm-functional-neutron{branch-designator}':
+          pipeline: gate
+          node: 'devstack-precise || devstack-trusty'
+          branch-designator: ''
+          branch-override: default
+      - '{pipeline}-shade-dsvm-functional-nova{branch-designator}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
           branch-designator: ''

jenkins/jobs/shade.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-shade-dsvm-functional{branch-designator}'
+    name: '{pipeline}-shade-dsvm-functional-neutron{branch-designator}'
     node: '{node}'
 
     wrappers:
@@ -15,6 +15,43 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TIMEOUT=60
+          export DEVSTACK_GATE_NEUTRON=1
+          export PROJECTS="openstack-infra/shade $PROJECTS"
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          function post_test_hook {{
+              $BASE/new/shade/shade/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:
+      - devstack-logs
+      - console-log
+
+- job-template:
+    name: '{pipeline}-shade-dsvm-functional-nova{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=0
           export PROJECTS="openstack-infra/shade $PROJECTS"
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then

zuul/layout.yaml

@@ -4413,9 +4413,11 @@ projects:
       - name: infra-publish-jobs
     check:
       - shade-coverage
-      - check-shade-dsvm-functional
+      - check-shade-dsvm-functional-neutron
+      - check-shade-dsvm-functional-nova
     gate:
-      - gate-shade-dsvm-functional
+      - gate-shade-dsvm-functional-neutron
+      - gate-shade-dsvm-functional-nova
     post:
       - shade-coverage