Update spec and requirements according to 2014.2.2 version

[openstack-build/ceilometer-build.git] / tests / runtests.sh

diff --git a/tests/runtests.sh b/tests/runtests.sh
index 86255b731b4e22599e101620d950810fa3a9e57b..e9efc146f579d498a7552ef2645251c7c94bc39b 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -42,10 +42,19 @@ 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 rabbitmq-server screen python-pip sqlite3 -y
+      apt-get install screen python-pip sqlite3 -y
    else
-      yum install screen rabbitmq-server python-pip sqlite -y
+      yum install screen python-pip sqlite -y
    fi
+}
+
+prepare_rabbit() {
+   if [[ `cat /etc/*-release | head -n 1 | awk '{print $1}'` =~ Ubuntu ]]; then
+      apt-get install rabbitmq-server -y
+   else
+      yum install rabbitmq-server -y
+   fi
+   echo "127.0.10.1 $(hostname)" >> /etc/hosts
    service rabbitmq-server restart
    sleep 5
 }
@@ -110,6 +119,7 @@ case $package in
    ceilometer-collector|openstack-ceilometer-collector|ceilometer-agent-notification|openstack-ceilometer-notification)
       prepare_config
       prepare_vm
+      prepare_rabbit
 
       if [[ `cat /etc/*-release | head -n 1 | awk '{print $1}'` =~ Ubuntu ]]; then
          apt-get install ceilometer-collector ceilometer-agent-notification -y
@@ -145,6 +155,7 @@ case $package in
       echo "Testing 'ceilometer-alarm-notifier'"
       prepare_config
       prepare_vm
+      prepare_rabbit
 
       screen -dmS ceilometer-alarm-notifier
       sleep 2