From c323784ef3d033663b4c298fd8195033d4814ba9 Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Fri, 8 Sep 2017 10:59:17 -0400
Subject: [PATCH] fix CI configuration issues

* update tox settings to work with constraints files
* add files assumed to be present by the doc build
  jobs but that aren't actually needed (so they are
  empty)

Change-Id: Ib7ea278f9dab502bc6f23af8d2dc1c37d2772977
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
---
 doc/source/_extra/.htaccess |  0
 doc/test/redirect-tests.txt |  0
 tools/tox_install.sh        | 30 ++++++++++++++++++++++++++++++
 tox.ini                     |  7 ++++---
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 doc/source/_extra/.htaccess
 create mode 100644 doc/test/redirect-tests.txt
 create mode 100755 tools/tox_install.sh

diff --git a/doc/source/_extra/.htaccess b/doc/source/_extra/.htaccess
new file mode 100644
index 0000000..e69de29
diff --git a/doc/test/redirect-tests.txt b/doc/test/redirect-tests.txt
new file mode 100644
index 0000000..e69de29
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
new file mode 100755
index 0000000..e61b63a
--- /dev/null
+++ b/tools/tox_install.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+# Client constraint file contains this client version pin that is in conflict
+# with installing the client from source. We should remove the version pin in
+# the constraints file before applying it for from-source installation.
+
+CONSTRAINTS_FILE="$1"
+shift 1
+
+set -e
+
+# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
+# published to logs.openstack.org for easy debugging.
+localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
+
+if [[ "$CONSTRAINTS_FILE" != http* ]]; then
+    CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE"
+fi
+# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
+curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile"
+
+pip install -c"$localfile" openstack-requirements
+
+# This is the main purpose of the script: Allow local installation of
+# the current repo. It is listed in constraints file and thus any
+# install will be constrained and we need to unconstrain it.
+edit-constraints "$localfile" -- "$CLIENT_NAME"
+
+pip install -c"$localfile" -U "$@"
+exit $?
diff --git a/tox.ini b/tox.ini
index 3062f3f..21c5397 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,10 +5,11 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 setenv =
-   VIRTUAL_ENV={envdir}
-   PYTHONWARNINGS=default::DeprecationWarning
+    VIRTUAL_ENV={envdir}
+    CLIENT_NAME=whereto
+    PYTHONWARNINGS=default::DeprecationWarning
 deps = -r{toxinidir}/test-requirements.txt
 commands =
   python setup.py test --coverage --coverage-package-name=whereto --slowest --testr-args='{posargs}'