From d17760e066ddbde4b7580451d7456584e7a66cc6 Mon Sep 17 00:00:00 2001
From: Gorka Eguileor <geguileo@redhat.com>
Date: Thu, 21 Mar 2019 14:11:30 +0100
Subject: [PATCH] Run cinderlib functional tests on Ceph job

This patch replaces job devstack-plugin-ceph-tempest with
cinder-plugin-ceph-tempest that inherits from it.

This job runs the same devstack-tempest.yaml playbook but also runs the
cinderlib-run.yaml playbook for the cinderlib functional tests.

Since the openstack/cinderlib project is a required project for this job
we'll be able to run cross-repo dependencies with cinderlib.

Change-Id: Ia532b3fcfbecee7c6dc7aa302e6d90a8067b7ff0
---
 .zuul.yaml                               | 10 +++++++++-
 playbooks/tempest-and-cinderlib-run.yaml | 23 +++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 playbooks/tempest-and-cinderlib-run.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index e8fe0fc671a..d0a2b5e3dc2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -31,7 +31,7 @@
             voting: false
             timeout: 5400
             irrelevant-files: *functional-irrelevant-files
-        - devstack-plugin-ceph-tempest:
+        - cinder-plugin-ceph-tempest:
             voting: false
             irrelevant-files: &gate-irrelevant-files
               - ^(test-|)requirements.txt$
@@ -143,3 +143,11 @@
     required-projects:
       - openstack/rally-openstack
       - openstack/osprofiler
+
+- job:
+    name: cinder-plugin-ceph-tempest
+    parent: devstack-plugin-ceph-tempest
+    run: playbooks/tempest-and-cinderlib-run.yaml
+    required-projects:
+      - openstack/cinderlib
+      - openstack/tempest
diff --git a/playbooks/tempest-and-cinderlib-run.yaml b/playbooks/tempest-and-cinderlib-run.yaml
new file mode 100644
index 00000000000..1fdc95b3940
--- /dev/null
+++ b/playbooks/tempest-and-cinderlib-run.yaml
@@ -0,0 +1,23 @@
+# Playbook imported from https://opendev.org/openstack/tempest/src/branch/master/playbooks/devstack-tempest.yaml
+
+# Changes that run through devstack-tempest are likely to have an impact on
+# the devstack part of the job, so we keep devstack in the main play to
+# avoid zuul retrying on legitimate failures.
+- hosts: all
+  roles:
+    - orchestrate-devstack
+
+# We run tests only on one node, regardless how many nodes are in the system
+- hosts: tempest
+  environment:
+    # This enviroment variable is used by the optional tempest-gabbi
+    # job provided by the gabbi-tempest plugin. It can be safely ignored
+    # if that plugin is not being used.
+    GABBI_TEMPEST_PATH: "{{ gabbi_tempest_path | default('') }}"
+  roles:
+    - setup-tempest-run-dir
+    - setup-tempest-data-dir
+    - acl-devstack-files
+    - run-tempest
+
+- import_playbook: cinderlib-run.yaml cinderlib_hosts=tempest