X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=tests%2Fruntests.sh;h=357a073ba53e41cc0fbbd1765d58310af804cad4;hb=3da538f2084de518d5e453e13b84f21be232224a;hp=e9efc146f579d498a7552ef2645251c7c94bc39b;hpb=a1b2853f97c805f96f5f9991c10e4c2e56b9e326;p=openstack-build%2Fceilometer-build.git

diff --git a/tests/runtests.sh b/tests/runtests.sh
index e9efc14..357a073 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -4,6 +4,7 @@ RES=0
 
 package=$1
 
+
 prepare_script() {
    echo '#!/usr/bin/env python
 import pika
@@ -42,9 +43,9 @@ connection=sqlite:////tmp/ceilometer" > /etc/ceilometer/ceilometer.conf
 
 prepare_vm() {
    if [[ `cat /etc/*-release | head -n 1 | awk '{print $1}'` =~ Ubuntu ]]; then
-      apt-get install screen python-pip sqlite3 -y
+      apt-get install screen python-pip sqlite3 curl -y
    else
-      yum install screen python-pip sqlite -y
+      yum install screen python-pip sqlite curl -y
    fi
 }
 
@@ -94,10 +95,42 @@ check_running() {
    fi
 }
 
+stop_services(){
+    ubuntu_services=(
+        ceilometer-api
+        ceilometer-agent-central
+        ceilometer-agent-compute
+        ceilometer-agent-notification
+        ceilometer-collector
+        ceilometer-alarm-evaluator
+        ceilometer-alarm-notifier
+    )
+    centos_services=(
+        openstack-ceilometer-api
+        openstack-ceilometer-collector
+        openstack-ceilometer-notification
+        openstack-ceilometer-alarm-notifier
+        openstack-ceilometer-alarm-evaluator
+        openstack-ceilometer-compute
+        openstack-ceilometer-central
+    )
+
+    if [[ `cat /etc/*-release | head -n 1 | awk '{print $1}'` =~ Ubuntu ]]; then
+      services=${ubuntu_services[*]}
+    else
+      services=${centos_services[*]}
+    fi
+
+    for service in ${services[*]}; do
+      service $service stop || true
+    done
+}
+
 case $package in
    ceilometer-api|openstack-ceilometer-api)
       prepare_config
       prepare_vm
+      stop_services
 
       screen -dmS ceilometer-api
       sleep 2
@@ -127,6 +160,7 @@ case $package in
          yum install openstack-ceilometer-collector openstack-ceilometer-notification -y
       fi
 
+      stop_services
       screen -dmS ceilometer-collector
       screen -dmS ceilometer-agent-notification
       sleep 2
@@ -138,7 +172,7 @@ case $package in
       check_running ceilometer-collector
       check_running ceilometer-agent-notification
       send_fake_notification
-      sleep 2
+      sleep 10
       check_fake_notification
 
       killall -15 ceilometer-collector ceilometer-agent-notification
@@ -156,6 +190,7 @@ case $package in
       prepare_config
       prepare_vm
       prepare_rabbit
+      stop_services
 
       screen -dmS ceilometer-alarm-notifier
       sleep 2
@@ -193,6 +228,7 @@ case $package in
    ceilometer-agent-compute|openstack-ceilometer-compute)
       prepare_vm
       prepare_config
+      stop_services
 
       screen -dmS ceilometer-agent-compute
       sleep 2
@@ -209,6 +245,7 @@ case $package in
    ceilometer-agent-central|openstack-ceilometer-central)
       prepare_vm
       prepare_config
+      stop_services
 
       screen -dmS ceilometer-agent-central
       sleep 2