X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=run_tests.sh;h=0892f92163e88b0f4516078aff0eca26bafb27b4;hb=c5162f01bb54eab6b3c4056074e28e0080dc4d08;hp=d5c3059246fe4d856155a050ea03ccc7a8a5fc8d;hpb=3e8bf0c0b273324d52970c7127d2be5e294e3aff;p=bottlenecks.git diff --git a/run_tests.sh b/run_tests.sh index d5c30592..0892f921 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -26,7 +26,9 @@ examples: report=true -arr_test_suite=(rubbos vstf) +arr_test_suite=(rubbos vstf posca) + +Bottlenecks_key_dir="/home/opnfv/bottlenecks/utils/infra_setup" function check_testcase(){ @@ -38,6 +40,9 @@ function check_testcase(){ "-vstf") SUITE_PREFIX=$SUITE_PREFIX_CONFIG/vstf/testcase_cfg ;; + "-posca") + SUITE_PREFIX=$SUITE_PREFIX_CONFIG/posca/testcase_cfg + ;; esac TEST_CASE=$2 @@ -66,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 @@ -90,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 @@ -99,6 +106,17 @@ function run_test(){ python /home/opnfv/bottlenecks/testsuites/vstf/run_vstf.py -c $file 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" + docker exec bottleneckcompose_bottlenecks_1 bash /home/opnfv/bottlenecks/run_posca.sh + ;; esac } @@ -129,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//,/ })