x/timmy
Code Issues Proposed changes

Change: use environment variable for openrc in SPT

Browse Source 
Change-Id: I4f61e0ac061263d249bfa210cc5f165fbfee2471
This commit is contained in:
Dmitrii Kabanov 2017-03-20 15:24:05 -07:00
parent ff8faad8a4
commit 39b8aa8b96
7 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
specs/python-timmy.spec
View File

@ -4,7 +4,7 @@
%global pypi_name timmy %global pypi_name timmy
Name: python-%{pypi_name} Name: python-%{pypi_name}
Version: 1.26.9 Version: 1.26.10
Release: 1%{?dist}~mos0 Release: 1%{?dist}~mos0
Summary: Log collector tool for OpenStack Fuel Summary: Log collector tool for OpenStack Fuel
@ -107,6 +107,9 @@ popd
%changelog %changelog
* Mon Mar 20 2017 Dmitrii Kabanov <dkabanov@mirantis.com> - 1.26.10
- Change: use environment variable for openrc in SPT
* Tue Mar 14 2017 Dmitry Sutyagin <dsutyagin@mirantis.com> - 1.26.9 * Tue Mar 14 2017 Dmitry Sutyagin <dsutyagin@mirantis.com> - 1.26.9
- Add: collect ceilometer & aodh config - Add: collect ceilometer & aodh config
- Fix: add "fuel2 task list" for 10.x series - Fix: add "fuel2 task list" for 10.x series

2
timmy/env.py
View File

@ -16,7 +16,7 @@
# under the License. # under the License.
project_name = 'timmy' project_name = 'timmy'
version = '1.26.9' version = '1.26.10'
if __name__ == '__main__': if __name__ == '__main__':
import sys import sys

4
timmy_data/simplified-performance-testing/config.yaml
View File

@ -5,3 +5,7 @@ rqdir: 'simplified-performance-testing'
timeout: 3600 timeout: 3600
soft_filter: soft_filter:
no_roles: ['fuel'] no_roles: ['fuel']
#env_vars:
# - 'OPENRC=/root/openrc'
# - 'LC_ALL="C"'
# - 'LANG="C"'

2
timmy_data/simplified-performance-testing/scripts/cinder-VM-volume-write.sh
View File

@ -54,7 +54,7 @@ function check_code {
fi fi
} }
. openrc source $OPENRC
# create keypair # create keypair
result="$(nova keypair-add "spt-temporary-keypair" >"spt-temporary-keypair" 2>&1)" result="$(nova keypair-add "spt-temporary-keypair" >"spt-temporary-keypair" 2>&1)"

2
timmy_data/simplified-performance-testing/scripts/glance-1-image-create.sh
View File

@ -2,7 +2,7 @@
set -x set -x
. openrc source $OPENRC
log='glance-image-upload.log' log='glance-image-upload.log'
rm $log rm $log
result="$(dd if=/dev/zero bs=1M count=4000 2>>$log | /usr/bin/time -f%e glance image-create --name "spt-test-image" --container-format bare --disk-format raw 2>>$log)" result="$(dd if=/dev/zero bs=1M count=4000 2>>$log | /usr/bin/time -f%e glance image-create --name "spt-test-image" --container-format bare --disk-format raw 2>>$log)"

2
timmy_data/simplified-performance-testing/scripts/glance-2-image-download.sh
View File

@ -2,7 +2,7 @@
set -x set -x
. openrc source $OPENRC
id=$(glance image-list | grep "spt-test-image" | cut -d' ' -f2) id=$(glance image-list | grep "spt-test-image" | cut -d' ' -f2)
/usr/bin/time -f%e glance image-download $id 2>&1 > /dev/null /usr/bin/time -f%e glance image-download $id 2>&1 > /dev/null
glance image-delete $id glance image-delete $id

2
timmy_data/simplified-performance-testing/scripts/network-VM-to-VM-iperf-tests.sh
View File

@ -64,7 +64,7 @@ function check_code {
} }
. openrc source $OPENRC
# create keypair # create keypair
result="$(nova keypair-add "spt-temporary-keypair" >"spt-temporary-keypair" 2>&1)" result="$(nova keypair-add "spt-temporary-keypair" >"spt-temporary-keypair" 2>&1)"