From 2e13f20fbe97ab23f5967a9d199f46979771320b Mon Sep 17 00:00:00 2001
From: John Griffith <john.griffith8@gmail.com>
Date: Tue, 12 May 2015 21:45:06 -0600
Subject: [PATCH] Add functional test job for cinderclient

We have functional tests merged in python-cinderclient now,
this patch adds the job to project-config to configure and
run.

Start of as experimental to make sure things are working.

Change-Id: Ie87b0d687d6be5ca74f4e3a110aa5cc754aa7085
---
 jenkins/jobs/cinder.yaml   | 36 ++++++++++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml |  5 +++++
 zuul/layout.yaml           |  1 +
 3 files changed, 42 insertions(+)
 create mode 100644 jenkins/jobs/cinder.yaml

diff --git a/jenkins/jobs/cinder.yaml b/jenkins/jobs/cinder.yaml
new file mode 100644
index 0000000000..f3e084a6d8
--- /dev/null
+++ b/jenkins/jobs/cinder.yaml
@@ -0,0 +1,36 @@
+- job-template:
+    name: '{pipeline}-cinderclient-dsvm-functional{branch-designator}'
+    node: '{node}'
+
+    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 BRANCH_OVERRIDE={branch-override}
+          export DEVSTACK_PROJECT_FROM_GIT=python-cinderclient
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          function post_test_hook {{
+              # Configure and run functional tests
+              $BASE/new/python-cinderclient/cinderclient/tests/functional/hooks/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:
+      - test-results
+      - devstack-logs
+      - console-log
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 195764f47b..489c0f0b48 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -798,6 +798,11 @@
       - openstack-publish-jobs
       - pypi-jobs
       - 'lib-forward-testing-{name}'
+      - '{pipeline}-cinderclient-dsvm-functional{branch-designator}':
+          pipeline: check
+          node: 'devstack-precise || devstack-trusty'
+          branch-designator: ''
+          branch-override: default
 
 
 - project:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 62e738d523..0ece8f93f4 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2257,6 +2257,7 @@ projects:
       - python-cinderclient-coverage
     experimental:
       - gate-grenade-dsvm-forward
+      - check-cinderclient-dsvm-functional
 
   - name: openstack/python-congressclient
     template: