From be083d2165a78b144c9ab76d5edcdda7c455c4f3 Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Mon, 21 Dec 2015 14:18:48 +1100
Subject: [PATCH] Add oldstable jobs for python-barbicanclient

In Ic5da694ff2daab2b958899cb0fa676dce30976f4 python-barbicanclient
switched to using gate_hook and devstack plugins, as extras.d has been
deprecated in mitaka.  This broke Kilo, as the plugin support hasn't
been backported that far.

Mirror the setup from barbican to define a job that uses the old
extras.d support in Kilo and the plugin for Liberty and Mitaka.

Change-Id: I42e05f142592d77641cfa9463d47ce3216c070c0
---
 jenkins/jobs/python-barbicanclient.yaml | 40 +++++++++++++++++++++++++
 zuul/layout.yaml                        |  8 +++++
 2 files changed, 48 insertions(+)

diff --git a/jenkins/jobs/python-barbicanclient.yaml b/jenkins/jobs/python-barbicanclient.yaml
index b07bad6748..7afeb2f9c8 100644
--- a/jenkins/jobs/python-barbicanclient.yaml
+++ b/jenkins/jobs/python-barbicanclient.yaml
@@ -1,3 +1,43 @@
+- job:
+    name: gate-python-barbicanclient-devstack-dsvm-oldstable
+    node: 'devstack-precise || devstack-trusty'
+
+    wrappers:
+      - build-timeout:
+          timeout: 65
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=60
+          export ENABLED_SERVICES=barbican,tempest,keystone
+          export PROJECTS="openstack/barbican $PROJECTS"
+          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
+
+          function pre_test_hook {
+              cd /opt/stack/new/barbican/functionaltests
+              ./pre_test_hook.sh
+          }
+          export -f pre_test_hook
+
+          function post_test_hook {
+              cd /opt/stack/new/python-barbicanclient/functionaltests
+              ./post_test_hook.sh
+          }
+          export -f post_test_hook
+
+          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:
     name: gate-python-barbicanclient-devstack-dsvm
     node: 'devstack-precise || devstack-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4b7452ab9f..155c47d916 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1411,6 +1411,12 @@ jobs:
   - name: magnum-coverage
     voting: false
 
+  - name: gate-python-barbicanclient-devstack-dsvm
+    branch: ^(?!stable/kilo).*$
+
+  - name: gate-python-barbicanclient-devstack-dsvm-oldstable
+    branch: ^stable/kilo$
+
   - name: gate-barbican-devstack-dsvm
     branch: ^(?!stable/kilo).*$
 
@@ -7958,8 +7964,10 @@ projects:
       - name: check-requirements
     check:
       - gate-python-barbicanclient-devstack-dsvm
+      - gate-python-barbicanclient-devstack-dsvm-oldstable
     gate:
       - gate-python-barbicanclient-devstack-dsvm
+      - gate-python-barbicanclient-devstack-dsvm-oldstable
 
   - name: openstack/python-blazarclient
     template: