From 3f7d9ab3d65e6480f5c1d9174adeecac4a65a8b1 Mon Sep 17 00:00:00 2001
From: Gorka Eguileor <geguileo@redhat.com>
Date: Thu, 7 Mar 2019 10:03:05 +0100
Subject: [PATCH] Enable publish-to-pypi Zuul job

This patch enables the publish-to-pypi Zull job and for that removes the
git repository from the test requirements and adds it instead to the Tox
file.

Change-Id: Id029cedef513753700a10bcae761fdc1807964e1
---
 .zuul.yaml            | 4 +---
 test-requirements.txt | 2 --
 tox.ini               | 2 ++
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 35bbdec..cfd06fc 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,8 +1,6 @@
 - project:
     templates:
-      # TODO(geguileo): Uncomment publish-to-pypi once we release Cinder on
-      # PyPi and we can add it to test-requirements instead of the git repo.
-      # - publish-to-pypi
+      - publish-to-pypi
       # PEP8 + PY27 + Post branch-tarball
       - openstack-python-jobs
       - openstack-python36-jobs
diff --git a/test-requirements.txt b/test-requirements.txt
index 0119a5f..9ba0853 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,5 +10,3 @@ oslotest>=3.2.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 stestr>=1.0.0 # Apache-2.0
-# There's no current Cinder PyPi package we can use
-git+git://github.com/openstack/cinder.git
diff --git a/tox.ini b/tox.ini
index ddba9ef..9f65a76 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,8 +11,10 @@ setenv = OS_STDOUT_CAPTURE=1
          OS_TEST_PATH=./cinderlib/tests/unit
 usedevelop=True
 install_command = pip install {opts} {packages}
+# Use cinder from master instead of from PyPi
 deps= -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
       -r{toxinidir}/test-requirements.txt
+      git+git://github.com/openstack/cinder.git
 
 commands =
     find . -ignore_readdir_race -type f -name "*.pyc" -delete