Use generic user for both zuul v2 and v3

daikk115 · tbreeds · commit d57063d8497b · 2018-09-12T06:57:34.000Z
Zuul v2 uses 'jenkins' as user, but Zuul v3 uses 'zuul'. Using $USER solves it for both cases. Change-Id: Ia3f2646bd3b5fa87c90c8dac57117fd29d73706b (cherry picked from commit 4707422)
diff --git a/novaclient/tests/functional/hooks/post_test_hook.sh b/novaclient/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 NOVACLIENT_DIR="$BASE/new/python-novaclient"
 
-sudo chown -R jenkins:stack $NOVACLIENT_DIR
+sudo chown -R $USER:stack $NOVACLIENT_DIR
 
 # Go to the novaclient dir
 cd $NOVACLIENT_DIR
@@ -37,7 +37,7 @@ cd $NOVACLIENT_DIR
 echo "Running novaclient functional test suite"
 set +e
 # Preserve env for OS_ credentials
-sudo -E -H -u jenkins tox -e ${TOX_ENV:-functional}
+sudo -E -H -u $USER tox -e ${TOX_ENV:-functional}
 EXIT_CODE=$?
 set -e
 
