From cf6119e042d3f30f1f9c5968f46eacdbdc51916e Mon Sep 17 00:00:00 2001
From: armando-migliaccio <armamig@gmail.com>
Date: Mon, 14 Jul 2014 16:36:41 -0700
Subject: [PATCH] Add experimental job Neutron DVR testing on single node
This change depends on:
(DevStack): https://review.openstack.org/103180
(DevStack-gate): https://review.openstack.org/106901
Supports-blueprint: neutron-ovs-dvr
Change-Id: Ia05f9fbb1d8fb5f3ec38b8263bcf83109742e5b3
---
.../config/devstack-gate.yaml | 33 +++++++++++++++++++
.../openstack_project/files/zuul/layout.yaml | 4 +++
2 files changed, 37 insertions(+)
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 e286ac8a0b..2cd718c53f 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}'
@@ -1270,6 +1302,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 e6c2d38679..4091bcff35 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -656,6 +656,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
@@ -1065,6 +1068,7 @@ projects:
experimental:
- check-neutron-dsvm-api
- gate-grenade-dsvm-neutron-forward
+ - check-tempest-dsvm-neutron-dvr
experimental-tripleo:
- check-tripleo-ironic-seed-precise
- check-tripleo-undercloud-precise