From 39b8aa8b96f226d3c7b6c026e4ee0a874491d661 Mon Sep 17 00:00:00 2001 From: Dmitrii Kabanov Date: Mon, 20 Mar 2017 15:24:05 -0700 Subject: [PATCH] Change: use environment variable for openrc in SPT Change-Id: I4f61e0ac061263d249bfa210cc5f165fbfee2471 --- specs/python-timmy.spec | 7 +++++-- timmy/env.py | 2 +- timmy_data/simplified-performance-testing/config.yaml | 4 ++++ .../scripts/cinder-VM-volume-write.sh | 2 +- .../scripts/glance-1-image-create.sh | 2 +- .../scripts/glance-2-image-download.sh | 2 +- .../scripts/network-VM-to-VM-iperf-tests.sh | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/specs/python-timmy.spec b/specs/python-timmy.spec index 693d71e..d545aa2 100644 --- a/specs/python-timmy.spec +++ b/specs/python-timmy.spec @@ -4,7 +4,7 @@ %global pypi_name timmy Name: python-%{pypi_name} -Version: 1.26.9 +Version: 1.26.10 Release: 1%{?dist}~mos0 Summary: Log collector tool for OpenStack Fuel @@ -107,6 +107,9 @@ popd %changelog +* Mon Mar 20 2017 Dmitrii Kabanov - 1.26.10 +- Change: use environment variable for openrc in SPT + * Tue Mar 14 2017 Dmitry Sutyagin - 1.26.9 - Add: collect ceilometer & aodh config - Fix: add "fuel2 task list" for 10.x series @@ -125,7 +128,7 @@ popd - Replace yaml.load() with yaml.safe_load() - Change: minor changes in analyze & rabbitmq module - Added: stderr for mapping scripts - + * Tue Dec 27 2016 Dmitry Sutyagin - 1.26.5 - Change: minor changes in analyze & rabbitmq module - Add: stderr for mapping scripts diff --git a/timmy/env.py b/timmy/env.py index d05aa7f..01bb203 100644 --- a/timmy/env.py +++ b/timmy/env.py @@ -16,7 +16,7 @@ # under the License. project_name = 'timmy' -version = '1.26.9' +version = '1.26.10' if __name__ == '__main__': import sys diff --git a/timmy_data/simplified-performance-testing/config.yaml b/timmy_data/simplified-performance-testing/config.yaml index 48c9832..5431971 100644 --- a/timmy_data/simplified-performance-testing/config.yaml +++ b/timmy_data/simplified-performance-testing/config.yaml @@ -5,3 +5,7 @@ rqdir: 'simplified-performance-testing' timeout: 3600 soft_filter: no_roles: ['fuel'] +#env_vars: +# - 'OPENRC=/root/openrc' +# - 'LC_ALL="C"' +# - 'LANG="C"' diff --git a/timmy_data/simplified-performance-testing/scripts/cinder-VM-volume-write.sh b/timmy_data/simplified-performance-testing/scripts/cinder-VM-volume-write.sh index ff41a2a..d95c6a2 100644 --- a/timmy_data/simplified-performance-testing/scripts/cinder-VM-volume-write.sh +++ b/timmy_data/simplified-performance-testing/scripts/cinder-VM-volume-write.sh @@ -54,7 +54,7 @@ function check_code { fi } -. openrc +source $OPENRC # create keypair result="$(nova keypair-add "spt-temporary-keypair" >"spt-temporary-keypair" 2>&1)" diff --git a/timmy_data/simplified-performance-testing/scripts/glance-1-image-create.sh b/timmy_data/simplified-performance-testing/scripts/glance-1-image-create.sh index 28c2ff6..ad696ef 100644 --- a/timmy_data/simplified-performance-testing/scripts/glance-1-image-create.sh +++ b/timmy_data/simplified-performance-testing/scripts/glance-1-image-create.sh @@ -2,7 +2,7 @@ set -x -. openrc +source $OPENRC log='glance-image-upload.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)" diff --git a/timmy_data/simplified-performance-testing/scripts/glance-2-image-download.sh b/timmy_data/simplified-performance-testing/scripts/glance-2-image-download.sh index 0dd7bf5..de6738e 100644 --- a/timmy_data/simplified-performance-testing/scripts/glance-2-image-download.sh +++ b/timmy_data/simplified-performance-testing/scripts/glance-2-image-download.sh @@ -2,7 +2,7 @@ set -x -. openrc +source $OPENRC id=$(glance image-list | grep "spt-test-image" | cut -d' ' -f2) /usr/bin/time -f%e glance image-download $id 2>&1 > /dev/null glance image-delete $id diff --git a/timmy_data/simplified-performance-testing/scripts/network-VM-to-VM-iperf-tests.sh b/timmy_data/simplified-performance-testing/scripts/network-VM-to-VM-iperf-tests.sh index 6a25d0e..d73f14c 100644 --- a/timmy_data/simplified-performance-testing/scripts/network-VM-to-VM-iperf-tests.sh +++ b/timmy_data/simplified-performance-testing/scripts/network-VM-to-VM-iperf-tests.sh @@ -64,7 +64,7 @@ function check_code { } -. openrc +source $OPENRC # create keypair result="$(nova keypair-add "spt-temporary-keypair" >"spt-temporary-keypair" 2>&1)"