From 09cce5376e40c299f16dea61301b773627a591ab Mon Sep 17 00:00:00 2001
From: Craig Vyvial <cp16net@gmail.com>
Date: Wed, 23 Sep 2015 23:03:51 -0500
Subject: [PATCH] Fix troveclient gate

This issue looks similar in nature to the saharaclient gate issues.

*-tempest-dsvm-neutron-src-python-troveclient job broken.
Need to enable trove devstack plugin for this job because need to test
trove in troveclient jobs

Change-Id: Icd34f4ba09528e691919bfc643c0e2a696f0ce76
---
 jenkins/jobs/projects.yaml |  6 +++++-
 jenkins/jobs/trove.yaml    | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 407674fa73..a995ef1e5b 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1793,7 +1793,11 @@
       - python-jobs
       - openstack-publish-jobs
       - pypi-jobs
-      - 'lib-forward-testing-{name}'
+      - '{pipeline}-tempest-dsvm-neutron-src-python-troveclient{branch-designator}':
+          pipeline: gate
+          node: 'devstack-precise || devstack-trusty'
+          branch-designator: ''
+          branch-override: default
 
 
 - project:
diff --git a/jenkins/jobs/trove.yaml b/jenkins/jobs/trove.yaml
index 6207c1424f..6a97196813 100644
--- a/jenkins/jobs/trove.yaml
+++ b/jenkins/jobs/trove.yaml
@@ -68,3 +68,36 @@
     publishers:
       - devstack-logs
       - console-log
+
+- job-template:
+    name: '{pipeline}-tempest-dsvm-neutron-src-python-troveclient{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_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove"
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
+          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