From 76e691a5524f7b8e6934b6d4ca0e734fdbaed67a Mon Sep 17 00:00:00 2001
From: armando-migliaccio <armamig@gmail.com>
Date: Fri, 12 Jun 2015 09:16:05 -0700
Subject: [PATCH] Add unstable Neutron job

A higher degree on concurrency triggered by patches [1, 2] led to instability
of the full Neutron job. Since it is difficult to troubleshoot and solve instability
issues whilst the gate is crippled, it is better to introduce an ad-hoc unstable job
that let folks work in isolation. Once issues are resolved, this job can be nuked.

[1] https://review.openstack.org/#/c/184383/
[2] https://review.openstack.org/#/c/140493/

Change-Id: Id406d50f63c433c7b4b1510bb176b280ac470ca0
---
 jenkins/jobs/neutron.yaml  | 32 ++++++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml |  5 +++++
 zuul/layout.yaml           |  5 +++++
 3 files changed, 42 insertions(+)

diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml
index b6ad0657be..6bef763035 100644
--- a/jenkins/jobs/neutron.yaml
+++ b/jenkins/jobs/neutron.yaml
@@ -217,3 +217,35 @@
     publishers:
       - devstack-logs
       - console-log
+
+- job-template:
+    name: '{pipeline}-tempest-dsvm-neutron-unstable{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_TEMPEST_FULL=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_NEUTRON_UNSTABLE=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
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index d135a2ac61..566b6bbb7c 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -491,6 +491,11 @@
           node: 'devstack-precise || devstack-trusty'
           branch-designator: ''
           branch-override: default
+      - '{pipeline}-tempest-dsvm-neutron-unstable{branch-designator}':
+          pipeline: check
+          node: 'devstack-precise || devstack-trusty'
+          branch-designator: ''
+          branch-override: default
 
 - project:
     name: neutron-fwaas
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 82f30d91d7..ec025d91ca 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1143,6 +1143,10 @@ jobs:
   - name: check-tempest-dsvm-neutron-linuxbridge
     voting: false
 
+  - name: check-tempest-dsvm-neutron-unstable
+    branch: ^(?!stable/(icehouse|juno|kilo)).*$
+    voting: false
+
   - name: gate-trove-buildimage-mysql
     voting: false
 
@@ -2035,6 +2039,7 @@ projects:
       - check-tempest-dsvm-neutron-dvr
       - check-neutron-lbaasv2-dsvm-api
       - check-tempest-dsvm-neutron-large-ops
+      - check-tempest-dsvm-neutron-unstable
     gate:
       - gate-neutron-dsvm-api
       - gate-neutron-dsvm-functional