common.sh (manila-8.1.3) | : | common.sh (manila-8.1.4) | ||
---|---|---|---|---|
skipping to change at line 63 | skipping to change at line 63 | |||
function manila_wait_for_drivers_init { | function manila_wait_for_drivers_init { | |||
# First argument is expected to be file path to Manila config | # First argument is expected to be file path to Manila config | |||
manila_wait_for_generic_driver_init $1 | manila_wait_for_generic_driver_init $1 | |||
# Sleep to make manila-share service notify manila-scheduler about | # Sleep to make manila-share service notify manila-scheduler about | |||
# its capabilities on time. | # its capabilities on time. | |||
sleep 10 | sleep 10 | |||
} | } | |||
function archive_file { | ||||
# First argument is expected to be filename | ||||
local filename=$1 | ||||
sudo gzip -9 $filename | ||||
sudo chown $USER:stack $filename.gz | ||||
sudo chmod a+r $filename.gz | ||||
} | ||||
function save_tempest_results { | function save_tempest_results { | |||
# First argument is expected to be number or tempest run | # First argument is expected to be number or tempest run | |||
local src_dirname | local src_dirname | |||
local dst_dirname | local dst_dirname | |||
src_dirname="$BASE/new/tempest" | src_dirname="$BASE/new/tempest" | |||
dst_dirname="$BASE/logs/tempest_$1" | dst_dirname="$BASE/logs/tempest_$1" | |||
# 1. Create destination directory | # 1. Create destination directory | |||
sudo mkdir $dst_dirname | sudo mkdir $dst_dirname | |||
sudo chown $USER:stack $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 | |||
sudo cp $src_dirname/etc/tempest.conf $dst_dirname/tempest_conf.txt | sudo cp $src_dirname/etc/tempest.conf $dst_dirname/tempest_conf.txt | |||
# 3. Save tempest log file | # 3. Save tempest log file | |||
cp $src_dirname/tempest.log $src_dirname/tempest.txt | cp $src_dirname/tempest.log $src_dirname/tempest.txt | |||
echo '' > $src_dirname/tempest.log | echo '' > $src_dirname/tempest.log | |||
archive_file $src_dirname/tempest.txt | sudo mv $src_dirname/tempest.txt $dst_dirname/tempest.txt | |||
sudo mv $src_dirname/tempest.txt.gz $dst_dirname/tempest.txt.gz | ||||
# 4. Save tempest stestr results | # 4. Save tempest stestr results | |||
if [ -f $src_dirname/.stestr/0 ]; then | if [ -f $src_dirname/.stestr/0 ]; then | |||
pushd $src_dirname | pushd $src_dirname | |||
sudo stestr last --subunit > $src_dirname/tempest.subunit | sudo stestr last --subunit > $src_dirname/tempest.subunit | |||
popd | popd | |||
else | else | |||
echo "Tests have not run!" | echo "Tests have not run!" | |||
fi | fi | |||
if [ -f $src_dirname/tempest.subunit ]; then | if [ -f $src_dirname/tempest.subunit ]; then | |||
s2h=`type -p subunit2html` | s2h=`type -p subunit2html` | |||
sudo $s2h $src_dirname/tempest.subunit $src_dirname/testr_results.html | sudo $s2h $src_dirname/tempest.subunit $src_dirname/testr_results.html | |||
archive_file $src_dirname/tempest.subunit | sudo mv $src_dirname/tempest.subunit $dst_dirname/tempest.subunit | |||
sudo mv $src_dirname/tempest.subunit.gz $dst_dirname/tempest.subunit.gz | sudo mv $src_dirname/testr_results.html $dst_dirname/testr_results.html | |||
archive_file $src_dirname/testr_results.html | ||||
sudo mv $src_dirname/testr_results.html.gz $dst_dirname/testr_results.ht | ||||
ml.gz | ||||
# 5. Cleanup | # 5. Cleanup | |||
sudo rm -rf $src_dirname/.stestr | sudo rm -rf $src_dirname/.stestr | |||
else | else | |||
echo "No 'stestr' results available for saving. File '$src_dirname/tempe st.subunit' is absent." | echo "No 'stestr' results available for saving. File '$src_dirname/tempe st.subunit' is absent." | |||
fi | fi | |||
} | } | |||
End of changes. 3 change blocks. | ||||
17 lines changed or deleted | 3 lines changed or added |