From 9d3d86e5e0208e5949ea0c4d7f25e0a08c7d03c4 Mon Sep 17 00:00:00 2001
From: Dai Dang Van <daidv@vn.fujitsu.com>
Date: Tue, 17 Oct 2017 14:07:16 +0700
Subject: [PATCH] Use generic user for both zuul v2 and v3

Zuul v2 uses 'jenkins' as user, but Zuul v3 uses 'zuul'.
Using $USER solves it for both cases.

Change-Id: I872aae3c3b0a739687be199c5c1858957f9cd3b0
---
 muranoclient/tests/functional/hooks/post_test_hook.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/muranoclient/tests/functional/hooks/post_test_hook.sh b/muranoclient/tests/functional/hooks/post_test_hook.sh
index b38e9482..7a7f365b 100755
--- a/muranoclient/tests/functional/hooks/post_test_hook.sh
+++ b/muranoclient/tests/functional/hooks/post_test_hook.sh
@@ -21,14 +21,14 @@ function generate_testr_results {
         sudo /usr/os-testr-env/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html
         sudo gzip -9 $BASE/logs/testrepository.subunit
         sudo gzip -9 $BASE/logs/testr_results.html
-        sudo chown jenkins:jenkins $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz
+        sudo chown $USER:$USER $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz
         sudo chmod a+r $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz
     fi
 }
 
 export MURANOCLIENT_DIR="$BASE/new/python-muranoclient"
 
-sudo chown -R jenkins:stack $MURANOCLIENT_DIR
+sudo chown -R $USER:stack $MURANOCLIENT_DIR
 
 # Get admin credentials
 cd $BASE/new/devstack
@@ -51,13 +51,13 @@ EOF
 # Go to the muranoclient dir
 cd $MURANOCLIENT_DIR
 
-sudo chown -R jenkins:stack $MURANOCLIENT_DIR
+sudo chown -R $USER:stack $MURANOCLIENT_DIR
 
 # Run tests
 echo "Running muranoclient functional test suite"
 set +e
 # Preserve env for OS_ credentials
-sudo -E -H -u jenkins tox -efunctional
+sudo -E -H -u $USER tox -efunctional
 EXIT_CODE=$?
 set -e