From 1da22a8bbe056394dd9c672ca2816092cd96a46f Mon Sep 17 00:00:00 2001
From: Jordan Pittier <jordan.pittier@scality.com>
Date: Wed, 22 Feb 2017 21:53:48 +0100
Subject: [PATCH] Add an experimental job to Tempest to run Cinder v1 tests.

With I0edf1d88c136c3b910a5773690a603eeacb50266 we want to disable running
Cinder V1 Tempest tests. So let's add a job in the experimental queue
to still run these tests, on demand.

Change-Id: I29db63b96327c2e00ea07dd28730739f2e437448
---
 jenkins/jobs/devstack-gate.yaml |  1 +
 jenkins/jobs/tempest-jobs.yaml  | 33 +++++++++++++++++++++++++++++++++
 zuul/layout.yaml                |  1 +
 3 files changed, 35 insertions(+)

diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 4d472c570b..0454c8a501 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -2508,6 +2508,7 @@
       - '{pipeline}-tempest-dsvm-neutron-full-non-admin-{node}{suffix}'
       - '{pipeline}-tempest-dsvm-neutron-full-test-accounts-{node}{suffix}'
       - '{pipeline}-tempest-dsvm-identity-v3-test-accounts-{node}{suffix}'
+      - '{pipeline}-tempest-dsvm-cinder-v1-{node}{suffix}'
       - '{pipeline}-tempest-dsvm-neutron-scenario-linuxbridge-{node}{suffix}'
       - '{pipeline}-tempest-dsvm-lxc-{node}{suffix}'
       - '{pipeline}-tempest-dsvm-nova-v20-api-{node}{suffix}'
diff --git a/jenkins/jobs/tempest-jobs.yaml b/jenkins/jobs/tempest-jobs.yaml
index 22d3fbb703..cb5cf8a3f6 100644
--- a/jenkins/jobs/tempest-jobs.yaml
+++ b/jenkins/jobs/tempest-jobs.yaml
@@ -22,3 +22,36 @@
           node: ubuntu-xenial
           suffix: '-ocata'
           branch-override: stable/ocata
+
+
+- job-template:
+    name: '{pipeline}-tempest-dsvm-cinder-v1-{node}{suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 180
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_LOCAL_CONFIG="TEMPEST_VOLUME_API_V1=True"
+          export DEVSTACK_GATE_TEMPEST_REGEX="volume"
+          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/zuul/layout.yaml b/zuul/layout.yaml
index a3ca950968..30e7be1756 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -17657,6 +17657,7 @@ projects:
       - gate-tempest-dsvm-neutron-full-non-admin-ubuntu-xenial
       - gate-tempest-dsvm-nova-v20-api-ubuntu-xenial
       - gate-tempest-dsvm-lvm-multibackend-ubuntu-xenial-nv
+      - gate-tempest-dsvm-cinder-v1-ubuntu-xenial
     post:
       - tempest-docs-ubuntu-xenial
       - tempest-coverage-ubuntu-xenial