From f1745ec27c103358707e27f5f17bded88d457676 Mon Sep 17 00:00:00 2001
From: Sean Dague <sdague@linux.vnet.ibm.com>
Date: Tue, 1 Oct 2013 08:03:14 -0400
Subject: [PATCH] add tenant isolation jobs to neutron patches

tenant isolation is flakey at best right now in the gate with
neutron, so the approach is to turn it off in the general case,
but enable it for the neutron jobs so they can work through why
neutron can't handle multiple simultaneous requests.

Fix leaving this out of devstack-gate / devstack-jobs

Change-Id: I00d49c89318044b87834616893439fed5b82534f
Partial-Bug: 1224001
---
 .../config/devstack-gate.yaml                 | 57 +++++++++++++++++++
 .../openstack_project/files/zuul/layout.yaml  |  8 +++
 2 files changed, 65 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 24460517e8..c088f0d2b7 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
@@ -238,6 +238,61 @@
       - console-log
 
 
+- job-template:
+    name: '{pipeline}-tempest-devstack-vm-neutron-isolated'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 60
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export TEMPEST_ALLOW_TENANT_ISOLATION=1
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
+- job-template:
+    name: '{pipeline}-tempest-devstack-vm-neutron-pg-isolated'
+    node: '{node}'
+
+    wrappers:
+      - timeout:
+          timeout: 60
+          fail: true
+      - timestamps
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_POSTGRES=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export TEMPEST_ALLOW_TENANT_ISOLATION=1
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+      - link-logs
+
+    publishers:
+      - devstack-logs
+      - console-log
+
+
 - job-template:
     name: '{pipeline}-tempest-devstack-vm-neutron-full'
     node: '{node}'
@@ -749,6 +804,8 @@
       - '{pipeline}-tempest-devstack-vm-cinder'
       - '{pipeline}-tempest-devstack-vm-neutron'
       - '{pipeline}-tempest-devstack-vm-neutron-pg'
+      - '{pipeline}-tempest-devstack-vm-neutron-isolated'
+      - '{pipeline}-tempest-devstack-vm-neutron-pg-isolated'
       - '{pipeline}-tempest-devstack-vm-neutron-full'
       - '{pipeline}-devstack-vm-cells'
       - '{pipeline}-tempest-devstack-vm-cells'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 755e836493..c5b69c1e8c 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -118,6 +118,10 @@ jobs:
     branch: ^(?!stable/folsom).*$
   - name: ^(gate|check)-tempest-devstack-vm-neutron-pg$
     branch: ^(?!stable/(folsom|grizzly)).*$
+  - name: ^(gate|check)-tempest-devstack-vm-neutron-isolated$
+    branch: ^(?!stable/(folsom|grizzly)).*$
+  - name: ^(gate|check)-tempest-devstack-vm-neutron-pg-isolated$
+    branch: ^(?!stable/(folsom|grizzly)).*$
   - name: ^(gate|check)-tempest-devstack-vm-neutron-full$
     branch: ^(?!stable/(folsom|grizzly)).*$
     voting: false
@@ -991,6 +995,8 @@ projects:
       - gate-neutron-python27
       - check-tempest-devstack-vm-neutron
       - check-tempest-devstack-vm-neutron-pg
+      - check-tempest-devstack-vm-neutron-isolated
+      - check-tempest-devstack-vm-neutron-pg-isolated
     gate:
       - gate-neutron-requirements
       - gate-neutron-docs
@@ -999,6 +1005,8 @@ projects:
       - gate-neutron-python27
       - gate-tempest-devstack-vm-neutron
       - gate-tempest-devstack-vm-neutron-pg
+      - gate-tempest-devstack-vm-neutron-isolated
+      - gate-tempest-devstack-vm-neutron-pg-isolated
     experimental:
       - gate-tempest-devstack-vm-neutron-full
     post: