Merge "Add scenarios from Neutron to multinode dvr full job"

jenkins/jobs/neutron.yaml

@@ -610,3 +610,42 @@
       - test-results
       - devstack-logs
       - console-log
+
+
+- job-template:
+    name: '{pipeline}-tempest-dsvm-neutron-dvr-multinode-scenario-{node-release}{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 180
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_CONFIGDRIVE=0
+          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
+          export DEVSTACK_GATE_TEMPEST_REGEX="^neutron\.tests\.tempest\.scenario\."
+          # Test DVR works multinode
+          export DEVSTACK_GATE_NEUTRON_DVR=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          export DEVSTACK_GATE_TOPOLOGY="multinode"
+
+          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

jenkins/jobs/projects.yaml

@@ -3720,6 +3720,12 @@
           node: ubuntu-xenial-2-node
           job-suffix: ''
           branch-override: default
+      - '{pipeline}-tempest-dsvm-neutron-dvr-multinode-scenario-{node-release}{job-suffix}':
+          pipeline: gate
+          node-release: ubuntu-xenial
+          node: ubuntu-xenial-2-node
+          job-suffix: '-nv'
+          branch-override: default
       - '{pipeline}-tempest-dsvm-multinode-live-migration-{node-release}{job-suffix}':
           pipeline: gate
           node-release: ubuntu-xenial

zuul/layout.yaml

@@ -11802,6 +11802,7 @@ projects:
       - gate-neutron-dsvm-fullstack-ubuntu-xenial
       - gate-tempest-dsvm-neutron-scenario
       - gate-tempest-dsvm-neutron-scenario-linuxbridge
+      - gate-tempest-dsvm-neutron-dvr-multinode-scenario-ubuntu-xenial-nv
       - gate-grenade-dsvm-neutron-forward
       - gate-neutron-vpnaas-dsvm-functional
       - gate-neutron-vpnaas-dsvm-functional-sswan