From f531c0d97b3300bef531166b178e4ff47c2bda4a Mon Sep 17 00:00:00 2001
From: Ilya Shakhat <shakhat@gmail.com>
Date: Wed, 15 May 2019 10:59:32 +0200
Subject: [PATCH] Fix devstack and py27 jobs

* Pin version of sphinx for py27.
* In devstack job manually copy source repos from
  performa organization.

Change-Id: Ie715ee7a1dff53e4b603fdb94ecc4ab7d386a392
---
 os_faults/tests/devstack/playbooks/pre.yml | 27 ++++++++++++++++++++++
 test-requirements.txt                      |  3 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/os_faults/tests/devstack/playbooks/pre.yml b/os_faults/tests/devstack/playbooks/pre.yml
index 5d779fd..3ad70e4 100644
--- a/os_faults/tests/devstack/playbooks/pre.yml
+++ b/os_faults/tests/devstack/playbooks/pre.yml
@@ -1,5 +1,32 @@
 ---
 
+# as of 15-May-19 devstack copies repos from hardcoded list of organizations only (and performa is not there)
+# copied from https://opendev.org/openstack/devstack/src/branch/master/roles/setup-devstack-source-dirs/tasks/main.yaml
+
+- hosts: all
+  tasks:
+    - name: Find source repos from performa organization
+      find:
+        paths:
+          - src/opendev.org/performa
+        file_type: directory
+      register: found_repos
+
+    - name: Copy Zuul repos into devstack working directory
+      command: rsync -a {{ item.path }} /opt/stack
+      with_items: '{{ found_repos.files }}'
+      become: yes
+
+    - name: Set ownership of repos
+      file:
+        path: /opt/stack
+        state: directory
+        recurse: true
+        owner: stack
+        group: stack
+      become: yes
+
+
 - hosts: all
   roles:
     - bindep
diff --git a/test-requirements.txt b/test-requirements.txt
index 5204882..72a16c1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,7 +12,8 @@ coverage>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 mock>=2.0 # BSD
 python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7'  # BSD
+sphinx!=1.6.6,!=1.6.7;python_version>='3.4'  # BSD
 sphinxcontrib-programoutput # BSD
 sphinx_rtd_theme # MIT
 openstackdocstheme>=1.11.0 # Apache-2.0