From 5264e8b3dfcf1c19fed9e999441b5b3735fb71b9 Mon Sep 17 00:00:00 2001
From: Eric Ball <eball@linuxfoundation.org>
Date: Fri, 14 Dec 2018 17:20:49 -0800
Subject: [PATCH] Pass PYTHONPATH to tox env to fix install issues

We have seen install issues that only seem to happen on build
machines. The reason these problems do not appear on local builds is
still not clear, but passing in the PYTHONPATH (set to the working
directory) is an innocuous change that fixes the problem.

Change-Id: I70217404b5a1f993d233714e2e1cac4ae9e7fd2d
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---
 shell/tox-run.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/shell/tox-run.sh b/shell/tox-run.sh
index 47380010..3f1f92a9 100644
--- a/shell/tox-run.sh
+++ b/shell/tox-run.sh
@@ -24,6 +24,11 @@ if [ -d "/opt/pyenv" ]; then
     export PATH="$PYENV_ROOT/bin:$PATH"
 fi
 
+# Set and pass in PYTHONPATH to circumvent installation bug in tox>=3.2.0
+PYTHONPATH=$(pwd)
+export PYTHONPATH
+export TOX_TESTENV_PASSENV=PYTHONPATH
+
 set +e  # Allow detox to fail so that we can collect the logs in the next step
 
 PARALLEL="${PARALLEL:-true}"
-- 
2.16.6