X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=tests%2Fruntests.sh;h=a3a8229f9db0a1be605cac5d1eab28cd90b419df;hb=7207429128d1db72fc89123c1f7a9bc72036b03a;hp=6c3cb7ba4c36c2add3903eab5908a83416624a54;hpb=ac8f04d5c1368e094653116d793ce670375ee5c1;p=openstack-build%2Fceilometer-build.git

diff --git a/tests/runtests.sh b/tests/runtests.sh
index 6c3cb7b..a3a8229 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -35,15 +35,20 @@ if [[ `cat /etc/*-release | head -n 1 | awk '{print $1}'` =~ Ubuntu ]]; then
       ceilometer-alarm-evaluator
    )
 
-   ceilometer_services=("${ceilometer_packages[@]}")
+   ceilometer_services=(
+      ceilometer-agent-central
+      ceilometer-agent-compute
+      ceilometer-collector
+      ceilometer-agent-notification
+      ceilometer-polling
+      ceilometer-api
+   )
 
    ceilometer_binaries=(
      ceilometer-collector
      ceilometer-agent-notification
      ceilometer-polling
      ceilometer-api
-     ceilometer-alarm-notifier
-     ceilometer-alarm-evaluator
      ceilometer-dbsync
      ceilometer-expirer
      ceilometer-rootwrap
@@ -60,7 +65,7 @@ if [[ `cat /etc/*-release | head -n 1 | awk '{print $1}'` =~ Ubuntu ]]; then
 else
    setenforce 0 && service firewalld stop
    os="centos"
-   packages_list="python-pip curl"
+   packages_list="curl python-pip"
    command_to_install="yum install -y"
    keystone_package="openstack-keystone"
    keystone_service="openstack-keystone"
@@ -74,7 +79,6 @@ else
       openstack-ceilometer-notification
       openstack-ceilometer-polling
       openstack-ceilometer-api
-      openstack-ceilometer-alarm
    )
    ceilometer_services=(
       openstack-ceilometer-central
@@ -83,13 +87,9 @@ else
       openstack-ceilometer-notification
       openstack-ceilometer-polling
       openstack-ceilometer-api
-      openstack-ceilometer-alarm-notifier
-      openstack-ceilometer-alarm-evaluator
    )
    ceilometer_binaries=(
      ceilometer-agent-notification
-     ceilometer-alarm-evaluator
-     ceilometer-alarm-notifier
      ceilometer-api
      ceilometer-collector
      ceilometer-dbsync
@@ -248,10 +248,12 @@ send_fake_instance_notification() {
      python get-pip.py
    fi
 
-   pip install pika==0.9.8
+   pip install pika==0.10.0
    echo '#!/usr/bin/env python
 import pika
 import uuid
+import logging
+logging.basicConfig()
 connection = pika.BlockingConnection(pika.ConnectionParameters(host="127.0.0.1"))
 channel = connection.channel()
 channel.queue_declare(queue="notifications.info")
@@ -349,13 +351,14 @@ case ${package_to_test} in
       fi
 
       # Alarming
-      ceilometer -dv ${ceilometer_auth_string} alarm-threshold-create --name cpu_high --description 'instance running hot' \
- --meter-name cpu_util  --threshold 70.0 --comparison-operator gt  --statistic avg \
- --period 600 --evaluation-periods 3 --alarm-action 'log://' --query resource_id="${resource_id}"
-
-      if [ "$?" -ne '0' -a -z "$(ceilometer ${ceilometer_auth_string} alarm-list | grep cpu_high)" ]; then
-         exit_on_error 1 "Alarm creation has failed"
-      fi
+# Moved to Aodh
+#      ceilometer -dv ${ceilometer_auth_string} alarm-threshold-create --name cpu_high --description 'instance running hot' \
+# --meter-name cpu_util  --threshold 70.0 --comparison-operator gt  --statistic avg \
+# --period 600 --evaluation-periods 3 --alarm-action 'log://' --query resource_id="${resource_id}"
+
+#      if [ "$?" -ne '0' -a -z "$(ceilometer ${ceilometer_auth_string} alarm-list | grep cpu_high)" ]; then
+#         exit_on_error 1 "Alarm creation has failed"
+#      fi
 
       # Samples
       ceilometer -dv ${ceilometer_auth_string} sample-create -m fake_sample --meter-type gauge --meter-unit '%' --sample-volume 100 -r "fake"