openstack/python-watcherclient
Code Issues Proposed changes

Use generic user for both zuul v2 and v3

Browse Source 
Zuul v2 uses 'jenkins' as user, but Zuul v3 uses 'zuul'.
Using $USER solves it for both cases.

Change-Id: I42c3328bf7ce5dbb745eb21954bc5528a6befed5
This commit is contained in:
Nam Nguyen Hoai
2017-10-18 13:59:39 +07:00
parent e92dd4db20
commit 42cab67124
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
watcherclient/tests/functional/hooks/post_test_hook.sh
View File

@@ -24,14 +24,14 @@ function generate_testr_results {
sudo /usr/os-testr-env/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html 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/testrepository.subunit
sudo gzip -9 $BASE/logs/testr_results.html 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 sudo chmod a+r $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz
fi fi
} }
export WATCHERCLIENT_DIR="$BASE/new/python-watcherclient" export WATCHERCLIENT_DIR="$BASE/new/python-watcherclient"
sudo chown -R jenkins:stack $WATCHERCLIENT_DIR sudo chown -R $USER:stack $WATCHERCLIENT_DIR
# Get admin credentials # Get admin credentials
cd $STACK_DIR cd $STACK_DIR
@@ -44,7 +44,7 @@ cd $WATCHERCLIENT_DIR
echo "Running watcherclient functional test suite" echo "Running watcherclient functional test suite"
set +e set +e
# Preserve env for OS_ credentials # Preserve env for OS_ credentials
sudo -E -H -u jenkins tox -efunctional sudo -E -H -u $USER tox -efunctional
EXIT_CODE=$? EXIT_CODE=$?
set -e set -e