Merge ~xnox/ubuntu/+source/ceilometer:master into ~ubuntu-server-dev/ubuntu/+source/ceilometer:master

[Dimitri John Ledkov]

Fix adt tests, should be fast-forwardable.

Pottentially we may want to move python-libvirt dependency from debian/tests/control to the appropriate package Depends in debian/control that ships ceilometer-agent-compute

[Corey Bryant (corey.bryant)]

Thanks Dimitri! LGTM.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 158b598..88a96b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,17 @@ ceilometer (1:7.0.0~b3~dev106-0ubuntu1) UNRELEASED; urgency=medium
   * d/ceilometer-common.postinst: Ensure proper permissions for
     /etc/ceilometer/rootwrap*.
 
+  [ Dimitri John Ledkov ]
+  * Add python-libvirt and libvirt-daemon-system to Depends in
+    debian/control/tests to make sure ceilometer-agent-compute is
+    running. Possibly makes sense to add python-libvirt as the Depends: on
+    the appropriate package, and only libvirt-daemon in the
+    debian/tests/contol.
+  * Iterate through all services, before exiting 1 in
+    debian/tests/test-services, to see all failing services at once.
+  * Skip testing for the ipmi agent service on s390x, not useful.
+  * Mark debian/tests/test-* files executable.
+
  -- Corey Bryant <[e-mail]>  Mon, 29 Aug 2016 16:33:06 -0400
 
 ceilometer (1:7.0.0~b2-0ubuntu2) yakkety; urgency=medium
diff --git a/debian/tests/control b/debian/tests/control
index 30e41d9..9ce1e65 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,2 @@
 Tests: test-daemons test-services test-python-ceilometer
-Depends: python-ceilometer, ceilometer-common, ceilometer-collector, ceilometer-api, ceilometer-agent-compute, ceilometer-agent-central, ceilometer-agent-ipmi, ceilometer-agent-notification, ceilometer-polling, rabbitmq-server
+Depends: python-ceilometer, ceilometer-common, ceilometer-collector, ceilometer-api, ceilometer-agent-compute, ceilometer-agent-central, ceilometer-agent-ipmi, ceilometer-agent-notification, ceilometer-polling, rabbitmq-server, python-libvirt, libvirt-daemon-system
diff --git a/debian/tests/test-daemons b/debian/tests/test-daemons
old mode 100644
new mode 100755
index 89c38a3..89c38a3
--- a/debian/tests/test-daemons
+++ b/debian/tests/test-daemons
diff --git a/debian/tests/test-python-ceilometer b/debian/tests/test-python-ceilometer
old mode 100644
new mode 100755
index 2f07bf1..2f07bf1
--- a/debian/tests/test-python-ceilometer
+++ b/debian/tests/test-python-ceilometer
diff --git a/debian/tests/test-services b/debian/tests/test-services
old mode 100644
new mode 100755
index cfd6343..abe67ef
--- a/debian/tests/test-services
+++ b/debian/tests/test-services
@@ -5,17 +5,27 @@
 set -e
 SERVICES=('ceilometer-agent-central'
           'ceilometer-agent-compute'
-          'ceilometer-agent-ipmi'
           'ceilometer-agent-notification'
           'ceilometer-api'
           'ceilometer-collector'
           'ceilometer-polling')
 
+# Doesn't work on s390x, and probably not needed as that is not an
+# IMPI architecture
+if [ `dpkg --print-architecture` != 's390x' ]
+then
+    SERVICES+=('ceilometer-agent-ipmi')
+fi
+
+ret=0
+
 for service in "${SERVICES[@]}"; do
     if systemctl is-active $service > /dev/null; then
         echo "OK"
     else
         echo "ERROR: ${service} IS NOT RUNNING"
-        exit 1
+        ret=1
     fi
 done
+
+exit $ret