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: If6b023e3be4a4555b656660a8522271668496ead

1 files changed, 3 insertions, 3 deletions

diff --git a/heatclient/tests/functional/hooks/post_test_hook.sh b/heatclient/tests/functional/hooks/post_test_hook.sh
index 505a7af..afce9af 100755
--- a/heatclient/tests/functional/hooks/post_test_hook.sh
+++ b/heatclient/tests/functional/hooks/post_test_hook.sh
@@ -21,7 +21,7 @@ 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
 }
@@ -35,13 +35,13 @@ source openrc admin admin
 # Go to the heatclient dir
 cd $HEATCLIENT_DIR
 
-sudo chown -R jenkins:stack $HEATCLIENT_DIR
+sudo chown -R $USER:stack $HEATCLIENT_DIR
 
 # Run tests
 echo "Running heatclient 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