From: Cyril Roelandt <cyril@redhat.com>
Date: Tue, 13 Oct 2015 12:46:39 +0000 (+0200)
Subject: Python 3: make post_test_hook work with more tox targets
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=62cdfee42f3d28b97908636bd5d0828ffdcaf135;p=openstack-build%2Fneutron-build.git

Python 3: make post_test_hook work with more tox targets

This makes it possible to run the script with different "flavors" of
"dsvm-functional" and "dsvm-fullstack". In particular, this is needed to
have a dsvm-functional-py34 gate running (see
https://review.openstack.org/#/c/233177/).

Change-Id: I38cadeecff6a8c0c55c103095c045a3e0c39bee1
Partial-Bug: #1500400
---

diff --git a/neutron/tests/contrib/post_test_hook.sh b/neutron/tests/contrib/post_test_hook.sh
index c42649b70..867002d1e 100644
--- a/neutron/tests/contrib/post_test_hook.sh
+++ b/neutron/tests/contrib/post_test_hook.sh
@@ -33,13 +33,13 @@ function generate_testr_results {
         sudo mv ./*.gz /opt/stack/logs/
     fi
 
-    if [ "$venv" == "dsvm-functional" ] || [ "$venv" == "dsvm-fullstack" ]
+    if [[ "$venv" == dsvm-functional* ]] || [[ "$venv" == dsvm-fullstack* ]]
     then
         generate_test_logs "/tmp/${venv}-logs"
     fi
 }
 
-if [ "$venv" == "dsvm-functional" ] || [ "$venv" == "dsvm-fullstack" ]
+if [[ "$venv" == dsvm-functional* ]] || [[ "$venv" == dsvm-fullstack* ]]
 then
     owner=stack
     sudo_env=