From d57063d8497b5224703c4b374492bdaf72fa73df Mon Sep 17 00:00:00 2001 From: Dai Dang Van Date: Tue, 17 Oct 2017 14:04:01 +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: Ia3f2646bd3b5fa87c90c8dac57117fd29d73706b (cherry picked from commit 4707422377214829126f1d6352119ea08a7ec104) --- novaclient/tests/functional/hooks/post_test_hook.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/novaclient/tests/functional/hooks/post_test_hook.sh b/novaclient/tests/functional/hooks/post_test_hook.sh index 766352933..473393eb6 100755 --- 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