Update to Python3

Updates to make StorPerf Python3 compatible, including pulling
in SNAPS-OO as python3.

Change-Id: Ie4e7af684bd5a1b8db086893848b1889da6308ba
JIRA: STORPERF-268
Signed-off-by: Mark Beierl <mbeierl@vmware.com>

3 files changed, 15 insertions, 13 deletions

diff --git a/ci/daily.sh b/ci/daily.sh
index 17026f3..1e99709 100755
--- a/ci/daily.sh
+++ b/ci/daily.sh
@@ -26,13 +26,13 @@ git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng "${WORKSPACE}/ci/job/
 rm -rf "${WORKSPACE}/ci/job/joid"
 git clone --depth 1 https://gerrit.opnfv.org/gerrit/joid "${WORKSPACE}/ci/job/joid"
 
-virtualenv "${WORKSPACE}/ci/job/storperf_daily_venv"
+python3 -m venv "${WORKSPACE}/ci/job/storperf_daily_venv"
 # shellcheck source=/dev/null
 source "${WORKSPACE}/ci/job/storperf_daily_venv/bin/activate"
 
-pip install --upgrade setuptools==40.5.0
-pip install python-openstackclient==3.16.1
-pip install python-heatclient==1.16.1
+python3 -m pip install --upgrade setuptools==40.5.0
+python3 -m pip install python-openstackclient==3.16.1
+python3 -m pip install python-heatclient==1.16.1
 
 "${WORKSPACE}/ci/generate-admin-rc.sh"
 
diff --git a/ci/verify-build.sh b/ci/verify-build.sh
index c98fea4..5230cee 100755
--- a/ci/verify-build.sh
+++ b/ci/verify-build.sh
@@ -35,6 +35,8 @@ export ARCH=${ARCH}
 
 echo Using $ARCH architecture
 
+export CURRENT_UID=$(id -u):$(id -g)
+
 docker-compose -f local-docker-compose.yaml down
 docker-compose -f local-docker-compose.yaml build
 docker-compose -f local-docker-compose.yaml up -d
diff --git a/ci/verify.sh b/ci/verify.sh
index 40e94b6..deaafb5 100755
--- a/ci/verify.sh
+++ b/ci/verify.sh
@@ -15,17 +15,17 @@ then
     WORKSPACE="$HOME"
 fi
 
-virtualenv $WORKSPACE/storperf_venv
+python3 -m venv $WORKSPACE/storperf_venv
 source $WORKSPACE/storperf_venv/bin/activate
 
-pip install --upgrade setuptools
-pip install autoflake==1.2
-pip install autopep8==1.3.5
-pip install coverage==4.5.1
-pip install flake8==3.5.0
-pip install mock==2.0.0
-pip install nose==1.3.7
-pip install -r docker/storperf-master/requirements.pip
+python3 -m pip  install --upgrade setuptools
+python3 -m pip  install autoflake==1.2
+python3 -m pip  install autopep8==1.3.5
+python3 -m pip  install coverage==4.5.1
+python3 -m pip  install flake8==3.5.0
+python3 -m pip  install mock==2.0.0
+python3 -m pip  install nose==1.3.7
+python3 -m pip  install -r docker/storperf-master/requirements.pip
 
 final_rc=0