From 3cf377d577271cdfb9fd7630d3f83f76a4b19a8b Mon Sep 17 00:00:00 2001 From: Nam Nguyen Hoai Date: Wed, 18 Oct 2017 13:56:37 +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: I42cfcd4d8dee2ff3a99e42a5a64f3c38163972b8 --- keystoneclient/tests/functional/hooks/post_test_hook.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keystoneclient/tests/functional/hooks/post_test_hook.sh b/keystoneclient/tests/functional/hooks/post_test_hook.sh index 951c321c5..a0adfd6a8 100755 --- a/keystoneclient/tests/functional/hooks/post_test_hook.sh +++ b/keystoneclient/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 keystoneclient dir cd $KEYSTONECLIENT_DIR -sudo chown -R jenkins:stack $KEYSTONECLIENT_DIR +sudo chown -R $USER:stack $KEYSTONECLIENT_DIR # Run tests echo "Running keystoneclient 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