openstack/manila
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: Ib83267ef75f91fb8f95af312d644ebe19c6307c9
This commit is contained in:
Raissa Sarmento 2017-10-13 15:13:16 +01:00
parent 3a9f67a90f
commit d482b16ca3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/ci/common.sh
View File

@ -65,7 +65,7 @@ function archive_file {
local filename=$1 local filename=$1
sudo gzip -9 $filename sudo gzip -9 $filename
sudo chown jenkins:jenkins $filename.gz sudo chown $USER:stack $filename.gz
sudo chmod a+r $filename.gz sudo chmod a+r $filename.gz
} }
@ -80,7 +80,7 @@ function save_tempest_results {
# 1. Create destination directory # 1. Create destination directory
sudo mkdir $dst_dirname sudo mkdir $dst_dirname
sudo chown jenkins:jenkins $dst_dirname sudo chown $USER:stack $dst_dirname
sudo chmod 755 $dst_dirname sudo chmod 755 $dst_dirname
# 2. Save tempest configuration file # 2. Save tempest configuration file

8
contrib/ci/post_test_hook.sh
View File

@ -16,8 +16,8 @@
# First argument ($1) expects 'multibackend' as value for setting appropriate # First argument ($1) expects 'multibackend' as value for setting appropriate
# tempest conf opts, all other values will assume singlebackend installation. # tempest conf opts, all other values will assume singlebackend installation.
sudo chown -R jenkins:stack $BASE/new/tempest sudo chown -R $USER:stack $BASE/new/tempest
sudo chown -R jenkins:stack $BASE/data/tempest sudo chown -R $USER:stack $BASE/data/tempest
sudo chmod -R o+rx $BASE/new/devstack/files sudo chmod -R o+rx $BASE/new/devstack/files
# Import devstack functions 'iniset', 'iniget' and 'trueorfalse' # Import devstack functions 'iniset', 'iniget' and 'trueorfalse'
@ -329,7 +329,7 @@ for port in ${UDP_PORTS[*]}; do
done done
echo "Running tempest manila test suites" echo "Running tempest manila test suites"
sudo -H -u jenkins tox -eall-plugin $MANILA_TESTS -- --concurrency=$MANILA_TEMPEST_CONCURRENCY sudo -H -u $USER tox -eall-plugin $MANILA_TESTS -- --concurrency=$MANILA_TEMPEST_CONCURRENCY
RETVAL=$? RETVAL=$?
@ -351,7 +351,7 @@ if [[ "$DRIVER" == "dummy" ]]; then
manila type-key default set driver_handles_share_servers=False manila type-key default set driver_handles_share_servers=False
echo "Running tempest manila test suites for DHSS=False mode" echo "Running tempest manila test suites for DHSS=False mode"
sudo -H -u jenkins tox -eall-plugin $MANILA_TESTS -- --concurrency=$MANILA_TEMPEST_CONCURRENCY sudo -H -u $USER tox -eall-plugin $MANILA_TESTS -- --concurrency=$MANILA_TEMPEST_CONCURRENCY
RETVAL2=$? RETVAL2=$?
save_tempest_results 2 save_tempest_results 2