Merge "Bug fix: yardstick result return no content"

[bottlenecks.git] / run_tests.sh

diff --git a/run_tests.sh b/run_tests.sh
index ad0b31c..0892f92 100755 (executable)
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -28,6 +28,8 @@ report=true
 
 arr_test_suite=(rubbos vstf posca)
 
+Bottlenecks_key_dir="/home/opnfv/bottlenecks/utils/infra_setup"
+
 function check_testcase(){
 
     check_suite="$1"
@@ -69,13 +71,14 @@ function run_test(){
 
     case $test_suite in
         "rubbos")
-            info "Running rubbos test suite"
+            info "Running rubbos test suite\n"
             test_file="/home/opnfv/bottlenecks/testsuites/rubbos/testsuite_story/rubbos_story1"
             if [[ -f $test_file ]]; then
                 testcases=($(cat $test_file))
             else
                 error "no rubbos test suite file"
             fi
+
             for i in "${testcases[@]}"; do
                 #check if the testcase is legal or not
                 check_testcase -rubbos $i
@@ -93,6 +96,7 @@ function run_test(){
             else
                 error "no vstf test suite file "
             fi
+
             for i in "${testcases[@]}"; do
                 #check if the testcase is legal or not
                 check_testcase -vstf $i
@@ -103,21 +107,15 @@ function run_test(){
             done
         ;;
         "posca")
+            info "Composing up dockers"
+            docker-compose -f /home/opnfv/bottlenecks/docker/bottleneck-compose/docker-compose.yml up -d
+            info "Pulling tutum/influxdb for yardstick"
+            docker pull tutum/influxdb:0.13
+            info "Copying testing scripts to docker"
+            docker cp /home/opnfv/bottlenecks/run_posca.sh bottleneckcompose_bottlenecks_1:/home/opnfv/bottlenecks
+            sleep 5
             info "Running posca test suite"
-            test_file="/home/opnfv/bottlenecks/testsuites/posca/testsuite_story/posca_factor_test"
-            if [[ -f $test_file ]]; then
-                testcases=($(cat $test_file))
-            else
-                error "no posca test suite file "
-            fi
-            for i in "${testcases[@]}"; do
-                #check if the testcase is legal or not
-                check_testcase -posca $i
-                #adjust config parameters
-                #run test case
-                file=${BASEDIR}/testsuites/posca/testcase_cfg/${i}.yaml
-                python /home/opnfv/bottlenecks/testsuites/posca/run_posca.py -c $file
-            done
+            docker exec bottleneckcompose_bottlenecks_1 bash /home/opnfv/bottlenecks/run_posca.sh
         ;;
     esac
 }
@@ -149,6 +147,18 @@ done
 BASEDIR=`dirname $0`
 source ${BASEDIR}/common.sh
 
+#Add random key generation
+if [ ! -d $Bottlenecks_key_dir/bottlenecks_key ]; then
+    mkdir $Bottlenecks_key_dir/bottlenecks_key
+else
+    rm -rf $Bottlenecks_key_dir/bottlenecks_key
+    mkdir $Bottlenecks_key_dir/bottlenecks_key
+fi
+chmod 700 $Bottlenecks_key_dir/bottlenecks_key
+
+ssh-keygen -t rsa -f $Bottlenecks_key_dir/bottlenecks_key/bottlenecks_key -q -N ""
+chmod 600 $Bottlenecks_key_dir/bottlenecks_key/*
+
 #check the test suite name is correct
 if [ "${SUITE}" != "" ]; then
     suite_exec=(${SUITE//,/ })