From 676159555f10964d0b7f5cf77539c49b3fd90cda Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Thu, 19 Oct 2017 15:48:12 -0500
Subject: Native DevStack jobs

Convert legacy DevStack jobs to native Zuul v3 form, plus some
test-job-related docs updates.

Change-Id: Ia8c08be81605da885b9eee799fc58129305dfc41
---
 tox.ini | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index a16f0eb8..ca19862e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -56,20 +56,20 @@ commands =
 [testenv:functional]
 setenv = OS_TEST_PATH=./openstackclient/tests/functional
 passenv = OS_*
-# Enable this when running Zuul v3 jobs
-#whitelist_externals = openstackclient/tests/functional/run_ostestr.sh
-#commands =
-#    {toxinidir}/openstackclient/tests/functional/run_ostestr.sh {posargs}
+whitelist_externals = openstackclient/tests/functional/run_ostestr.sh
+commands =
+    {toxinidir}/openstackclient/tests/functional/run_ostestr.sh {posargs}
 
 [testenv:functional-tips]
 setenv = OS_TEST_PATH=./openstackclient/tests/functional
 passenv = OS_*
+whitelist_externals = openstackclient/tests/functional/run_ostestr.sh
 commands =
-    pip install -q -U -e "git+file:///opt/stack/new/osc-lib#egg=osc_lib"
-    pip install -q -U -e "git+file:///opt/stack/new/python-openstacksdk#egg=openstacksdk"
-    pip install -q -U -e "git+file:///opt/stack/new/os-client-config#egg=os_client_config"
+    pip install -q -U -e "git+file://{toxinidir}/../osc-lib#egg=osc_lib"
+    pip install -q -U -e "git+file://{toxinidir}/../os-client-config#egg=os_client_config"
+    pip install -q -U -e "git+file://{toxinidir}/../python-openstacksdk#egg=openstacksdk"
     pip freeze
-    ostestr {posargs}
+    {toxinidir}/openstackclient/tests/functional/run_ostestr.sh {posargs}
 
 [testenv:venv]
 commands = {posargs}
-- 
cgit v1.2.1