diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index c3d25f89f5..f1dd195c58 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -375,6 +375,38 @@ - devstack-logs - console-log +- job-template: + name: '{pipeline}-tempest-dsvm-neutron-dvr{branch-designator}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 125 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_NEUTRON=1 + export DEVSTACK_GATE_NEUTRON_DVR=1 + export DEVSTACK_GATE_SMOKE_SERIAL=1 + export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1 + export BRANCH_OVERRIDE={branch-override} + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + 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}-tempest-dsvm-neutron-full{branch-designator}' @@ -1337,6 +1369,7 @@ - '{pipeline}-tempest-master-dsvm-neutron{branch-designator}' - '{pipeline}-tempest-dsvm-neutron-pg{branch-designator}' - '{pipeline}-tempest-dsvm-neutron-isolated-parallel{branch-designator}' + - '{pipeline}-tempest-dsvm-neutron-dvr{branch-designator}' - '{pipeline}-tempest-dsvm-neutron-full{branch-designator}' - '{pipeline}-devstack-dsvm-cells{branch-designator}' - '{pipeline}-tempest-dsvm-cells{branch-designator}' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index c9436af569..3154d26196 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -679,6 +679,9 @@ jobs: - name: check-neutron-dsvm-api branch: ^(?!stable/(havana|icehouse)).*$ voting: false + - name: check-tempest-dsvm-neutron-dvr + branch: ^(?!stable/(havana|icehouse)).*$ + voting: false - name: gate-trove-buildimage-mysql voting: false - name: gate-trove-functional-dsvm-mysql @@ -1110,6 +1113,7 @@ projects: experimental: - check-neutron-dsvm-api - gate-grenade-dsvm-neutron-forward + - check-tempest-dsvm-neutron-dvr experimental-tripleo: - check-tripleo-ironic-seed-precise-nonha - check-tripleo-novabm-undercloud-precise-nonha