Fixed firewalld-related code in test script

also bump version

Closes-Bug: #1609844

Change-Id: I9a4a9464622bb22109cf3652a01c056af284d114

diff --git a/centos7/rpm/SPECS/openstack-ceilometer.spec b/centos7/rpm/SPECS/openstack-ceilometer.spec
index 5a9dcbff0ee0d745813dd1a3654bfd0f034ab0d2..5a71ad80a8ed74c1c512cfc615fc3e773d5d6325 100644 (file)
--- a/centos7/rpm/SPECS/openstack-ceilometer.spec
+++ b/centos7/rpm/SPECS/openstack-ceilometer.spec
@@ -7,7 +7,7 @@ Name:             openstack-ceilometer
 # https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z
 Epoch:            1
 Version:          5.0.0.0rc1
-Release:          1%{?dist}~mos8.0.1
+Release:          2%{?dist}~mos8.0.1
 Summary:          OpenStack measurement collection service
 
 Group:            Applications/System

diff --git a/tests/runtests.sh b/tests/runtests.sh
index 6c3cb7ba4c36c2add3903eab5908a83416624a54..163281e1223f5c76c3e6e3f8b76d7679f80d082c 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -58,7 +58,8 @@ if [[ `cat /etc/*-release | head -n 1 | awk '{print $1}'` =~ Ubuntu ]]; then
      policy.json
    )
 else
-   setenforce 0 && service firewalld stop
+   setenforce 0 || :
+   service firewalld stop || :
    os="centos"
    packages_list="python-pip curl"
    command_to_install="yum install -y"

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index fdae7627f006c85c2dbec3e690377b11447dd19e..556378291eabb9b0ed16e2b108a7c91f4ecf9b60 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+ceilometer (1:5.0.0-6~u14.04+mos1) mos8.0; urgency=medium
+
+  * Bump version
+
+ -- Denis Puchkin <dpuchkin@mirantis.com>  Fri, 12 Aug 2016 15:42:18 +0300
+
 ceilometer (1:5.0.0-5~u14.04+mos1) mos8.0; urgency=medium
 
   * d/ceilometer-agent-*.init.in: Fix DAEMON_ARGS for