From a2cf69ecd9deab976b5251713080d547fe0f762c Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Wed, 24 Apr 2019 14:20:46 -0600
Subject: [PATCH] Switch ubuntu to use python3 packages for tempest deps

Use the package version of the dependencies on Ubuntu rather than try to
install the dependencies from source using pip.

Change-Id: Ifefa99d761eb9157835fc95c6a9b93f9bdb42359
---
 run_tests.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/run_tests.sh b/run_tests.sh
index 89ec83402..acc2b5eba 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -257,15 +257,13 @@ print_header 'Prepare Tempest'
 $SUDO touch /tmp/openstack/tempest/test-whitelist.txt /tmp/openstack/tempest/test-blacklist.txt
 $SUDO chown -R "$(id -u):$(id -g)" /tmp/openstack/tempest/
 
-# install from source now on ubuntu until packaged
 if uses_debs; then
     cd /tmp/openstack/tempest-horizon;
+    pkglist="tempest python3-stestr python3-os-testr python3-tempest"
     if [ $(lsb_release --id -s) = "Debian" ] ; then
-        $SUDO apt-get install -y tempest python3-stestr python3-os-testr python3-tempest python3-tempest-horizon
-    else
-        $SUDO python setup.py install
-        $SUDO pip install -U stestr os-testr
+        pkglist="${pkglist} python3-tempest-horizon"
     fi
+    $SUDO apt-get install -y $pkglist
 fi
 
 set +e