diff options
author | Dai Dang Van <daidv@vn.fujitsu.com> | 2017-10-17 14:04:01 +0700 |
---|---|---|
committer | Takashi NATSUME <natsume.takashi@lab.ntt.co.jp> | 2018-04-19 07:12:49 +0000 |
commit | 5aa1215fcdd2cd638950cd1fe1e8bf43e54c11e6 (patch) | |
tree | bb128f5a90c4ff8ec9f8d310a84700c4f04aeafd | |
parent | ba6f5dd73cd575a8476badb506715531414dcb59 (diff) | |
download | python-novaclient-5aa1215fcdd2cd638950cd1fe1e8bf43e54c11e6.tar.gz |
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)
-rwxr-xr-x | novaclient/tests/functional/hooks/post_test_hook.sh | 6 |
1 files 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 76635293..473393eb 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 |