From 27103fa9bdb8458dfd22e3eea9f32904c9f8b711 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 14 Nov 2014 19:45:57 +0300 Subject: [PATCH] Update requirements * Requirements for master branch has been updated * Changes in tests: Rabbitmq-server restart block has been added Change-Id: I025ddef7f051cb8f2b853957b6091f566b45b0ab --- .gitreview | 4 +- debian/changelog | 7 +++ debian/control | 81 ++++++++++++++--------------- rpm/SPECS/openstack-ceilometer.spec | 58 ++++++++++++--------- tests/runtests.sh | 17 ++++++ 5 files changed, 97 insertions(+), 70 deletions(-) diff --git a/.gitreview b/.gitreview index 6a642ed..fb0b841 100644 --- a/.gitreview +++ b/.gitreview @@ -1,5 +1,5 @@ [gerrit] -host=gerrit.mirantis.com +host=review.fuel-infra.org port=29418 -project=openstack-ci/openstack/ceilometer-build +project=openstack-build/ceilometer-build defaultbranch=master diff --git a/debian/changelog b/debian/changelog index 0729c78..f0ccf1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ceilometer (2014.2.b1-0ubuntu1) trusty; urgency=medium + + * Update to 2014.2 version: + - Update requirements + + -- Daniil Trishkin Wed, 19 Nov 2014 12:22:28 +0300 + ceilometer (2014.2.b1-0ubuntu1) trusty; urgency=medium * Update to 2014.2.b1 version: diff --git a/debian/control b/debian/control index 9d23a34..b3aeabd 100644 --- a/debian/control +++ b/debian/control @@ -13,48 +13,46 @@ Build-Depends: python-croniter (>= 0.3.4), python-coverage, python-docutils, - python-eventlet (>= 0.13.0), + python-eventlet (>= 0.15.2), python-fixtures (>= 0.3.14), python-flask (>= 0.10), python-flask (<< 1.0), - python-glanceclient (>= 1:0.13.1), + python-glanceclient (>= 1:0.14.0), python-httplib2, python-happybase (>= 0.5), python-happybase (<< 0.7) | python-happybase (>> 0.7), python-iso8601 (>= 0.1.9), - python-jsonpath-rw (>= 1.2.0), - python-jsonpath-rw (<< 2.0), - python-jsonschema (>= 2.0.0), - python-jsonschema (<< 3.0.0), - python-keystoneclient (>= 1:0.9.0), + python-jsonpath-rw (>= 1.2.0), python-jsonpath-rw (<< 2.0), + python-jsonschema (>= 2.0.0), python-jsonschema (<< 3.0.0), + python-keystoneclient (>= 1:0.11.1), python-keystonemiddleware (>= 1.0.0), python-lxml (>= 2.3), python-lockfile (>= 0.8), - python-migrate (>= 0.9.1), + python-migrate (>= 0.9.1), python-migrate (<< 0.9.2) | python-migrate (>> 0.9.2), python-mock, python-mox, python-msgpack (>= 0.4.0), python-mysqldb, - python-netaddr (>= 0.7.6), + python-netaddr (>= 0.7.12), python-nova, - python-novaclient (>= 1:2.17.0), - python-neutronclient (>= 2.3.5), - python-oslo.config (>= 1:1.2.1), - python-oslo.utils (>= 0.1.1), + python-novaclient (>= 1:2.18.0), + python-neutronclient (>= 2.3.6), + python-oslo.config (>= 1:1.4.0), + python-oslo.utils (>= 1.0.0), python-oslo.i18n (>= 0.1.0), python-oslo.sphinx, - python-pastedeploy (>= 1.5.0), python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0), python-pecan (>= 0.5.0), python-pymongo (>= 2.6), - python-requests (>= 1.1), + python-requests (>= 2.2.0), python-requests (<< 2.4.0) | python-requests (>> 2.4.0), python-simplejson, python-sphinx, - python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.9.5) | python-sqlalchemy (>> 0.9.5), python-sqlalchemy (<= 0.9.99), - python-stevedore (>= 0.14), + python-pastedeploy (>= 1.5.0), + python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.8.99) | python-sqlalchemy (>> 0.9.7), python-sqlalchemy (<= 0.9.99), + python-stevedore (>= 1.1.0), python-subunit, python-six (>= 1.7.0), python-swift, - python-swiftclient (>= 2.0.2), + python-swiftclient (>= 2.2.0), python-testscenarios (>= 0.4), python-testtools (>= 0.9.32), python-webob (>= 1.2.3), @@ -68,37 +66,37 @@ Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/ceilometer/icehouse Package: python-ceilometer Architecture: all Depends: + python-retrying (>= 1.2.2), python-retrying (<< 1.3.0) | python-retrying (>> 1.3.0), + python-oslo.rootwrap (>= 1.3.0), alembic (>= 0.6.4), python-anyjson (>= 0.3.3), python-argparse, python-croniter (>= 0.3.4), python-ceilometerclient (>= 1.0.6), - python-eventlet (>= 0.13.0), - python-flask (>= 0.10), - python-flask (<< 1.0), - python-glanceclient (>= 1:0.13.1), + python-eventlet (>= 0.15.2), + python-flask (>= 0.10), python-flask (<< 1.0), + python-glanceclient (>= 1:0.14.0), python-happybase (>= 0.5), python-happybase (<< 0.7) | python-happybase (>> 0.7), - python-sqlalchemy (<= 0.9.99), + python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.8.99) | python-sqlalchemy (>> 0.9.7), python-sqlalchemy (<= 0.9.99), python-iso8601 (>= 0.1.9), - python-jsonpath-rw (>= 1.2.0), - python-jsonpath-rw (<< 2.0), - python-jsonschema (>= 2.0.0), - python-jsonschema (<< 3.0.0), - python-keystoneclient (>= 1:0.9.0), + python-jsonpath-rw (>= 1.2.0), python-jsonpath-rw (<< 2.0), + python-jsonschema (>= 2.0.0), python-jsonschema (<< 3.0.0), + python-keystoneclient (>= 1:0.11.1), python-keystonemiddleware (>= 1.0.0), python-lxml (>= 2.3), python-lockfile (>= 0.8), - python-migrate (>= 0.9.1), + python-migrate (>= 0.9.1), python-migrate (<< 0.9.2) | python-migrate (>> 0.9.2), python-msgpack (>= 0.4.0), - python-netaddr (>= 0.7.6), - python-neutronclient (>= 2.3.5), - python-novaclient (>= 1:2.17.0), - python-oslo.config (>= 1:1.2.1), - python-oslo.db (>= 0.2.0), - python-oslo.utils (>= 0.1.1), - python-oslo.messaging (>= 1.3.0), - python-oslo.serialization (>= 0.1.0), - python-oslo.vmware (>= 0.4), + python-netaddr (>= 0.7.12), + python-neutronclient (>= 2.3.6), + python-novaclient (>= 1:2.18.0), + python-oslo.config (>= 1:1.4.0), + python-oslo.db (>= 1.0.0), + python-oslo.utils (>= 1.0.0), + python-oslo.messaging (>= 1.4.0), + python-oslo.middleware (>= 0.1.0), + python-oslo.serialization (>= 1.0.0), + python-oslo.vmware (>= 0.6.0), python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0), python-pecan (>= 0.5.0), python-posix-ipc, @@ -106,10 +104,9 @@ Depends: python-six (>= 1.7.0), python-tooz (>= 0.3), python-yaml (>= 3.1.0), - python-requests (>= 1.1), - python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.9.5) | python-sqlalchemy (>> 0.9.5), python-sqlalchemy (<= 0.9.99), - python-stevedore (>= 0.14), - python-swiftclient (>= 2.0.2), + python-requests (>= 2.2.0), python-requests (<< 2.4.0) | python-requests (>> 2.4.0), + python-stevedore (>= 1.1.0), + python-swiftclient (>= 2.2.0), python-tz, python-webob (>= 1.2.3), python-wsme (>= 0.6), diff --git a/rpm/SPECS/openstack-ceilometer.spec b/rpm/SPECS/openstack-ceilometer.spec index a4496e1..733f1de 100644 --- a/rpm/SPECS/openstack-ceilometer.spec +++ b/rpm/SPECS/openstack-ceilometer.spec @@ -58,42 +58,44 @@ collect metrics from OpenStack components. Summary: OpenStack ceilometer python libraries Group: Applications/System +Requires: python-retrying >= 1.2.2, python-retrying < 1.3.0, python-retrying > 1.3.0 Requires: python-qpid Requires: python-babel -Requires: python-eventlet >= 0.13.0 +Requires: python-eventlet >= 0.15.2 Requires: python-iso8601 >= 0.1.9 Requires: python-lxml >= 2.3 Requires: python-anyjson >= 0.3.3 Requires: python-jsonpath-rw >= 1.2.0, python-jsonpath-rw < 2.0 -Requires: python-stevedore >= 0.14 +Requires: python-stevedore >= 1.1.0 Requires: python-msgpack >= 0.4.0 Requires: python-posix_ipc Requires: python-six >= 1.7.0 -Requires: PyYAML +Requires: PyYAML >= 3.1.0 +Requires: python-sqlalchemy >= 0.8.4, python-sqlalchemy <= 0.8.99, python-sqlalchemy >= 0.9.7, python-sqlalchemy <= 0.9.99 Requires: python-argparse -Requires: python-croniter >= 0.3.4 Requires: python-happybase >= 0.5, python-happybase < 0.7, python-happybase > 0.7 Requires: python-jsonschema >= 2.0.0, python-jsonschema < 3.0.0 Requires: python-lockfile >= 0.8 -Requires: python-netaddr >= 0.7.6 +Requires: python-netaddr >= 0.7.12 Requires: python-pbr >= 0.6, python-pbr < 0.7, python-pbr > 0.7, python-pbr < 1.0 -Requires: python-requests >= 1.1 +Requires: python-requests >= 2.2.0, python-requests < 2.4.0, python-requests > 2.4.0 Requires: python-tooz >= 0.3 -Requires: python-sqlalchemy >= 0.8.4, python-sqlalchemy < 0.95, python-sqlalchemy > 0.9.5, python-sqlalchemy <= 0.9.99 Requires: python-alembic >= 0.6.4 -Requires: python-migrate >= 0.9.1 +Requires: python-migrate >= 0.9.1, python-migrate < 0.9.2, python-migrate > 0.9.2 Requires: python-webob >= 1.2.3 -Requires: python-oslo-config >= 1:1.2.1 -Requires: python-oslo.db >= 0.2.0 -Requires: python-oslo-vmware >= 0.4 -Requires: python-oslo-utils >= 0.1.1 -Requires: python-oslo-messaging >= 1.3.0 -Requires: python-oslo.serialization >= 0.1.0 +Requires: python-oslo-config >= 1:1.4.0 +Requires: python-oslo-db >= 1.0.0 +Requires: python-oslo-rootwrap >= 1.3.0 +Requires: python-oslo-vmware >= 0.6.0 +Requires: python-oslo-utils >= 1.0.0 +Requires: python-oslo-messaging >= 1.4.0 +Requires: python-oslo-serialization >= 1.0.0 +Requires: python-oslo-middleware >= 0.1.0 Requires: pysnmp > 4.2.1, pysnmp < 5.0.0 Requires: pytz @@ -109,11 +111,11 @@ Requires: python-pymongo Requires: python-flask Requires: python-pecan >= 0.5.0 Requires: python-wsme >= 0.6 -Requires: python-neutronclient >= 2.3.5 -Requires: python-novaclient >= 2.17.0 -Requires: python-keystoneclient >= 0.9.0 -Requires: python-glanceclient >= 0.13.1 -Requires: python-swiftclient >= 2.0.2 +Requires: python-neutronclient >= 2.3.6 +Requires: python-novaclient >= 2.18.0 +Requires: python-keystoneclient >= 0.11.1 +Requires: python-glanceclient >= 0.14.0 +Requires: python-swiftclient >= 2.2.0 Requires: python-ceilometerclient >= 1.0.6 Requires: libvirt-python @@ -151,8 +153,8 @@ Group: Applications/System Requires: %{name}-common = %{version}-%{release} -Requires: python-novaclient >= 2.17.0 -Requires: python-keystoneclient >= 0.9.0 +Requires: python-novaclient >= 2.18.0 +Requires: python-keystoneclient >= 0.11.1 Requires: libvirt-python %description compute @@ -169,10 +171,10 @@ Group: Applications/System Requires: %{name}-common = %{version}-%{release} -Requires: python-novaclient >= 2.17.0 -Requires: python-keystoneclient >= 0.9.0 -Requires: python-glanceclient >= 0.13.1 -Requires: python-swiftclient >= 2.0.2 +Requires: python-novaclient >= 2.18.0 +Requires: python-keystoneclient >= 0.11.1 +Requires: python-glanceclient >= 0.14.0 +Requires: python-swiftclient >= 2.2.0 %description central OpenStack ceilometer provides services to measure and @@ -224,8 +226,8 @@ Requires: %{name}-common = %{version}-%{release} Requires: python-pymongo Requires: python-flask -Requires: python-pecan >= 0.4.5 Requires: python-wsme >= 0.6 +Requires: python-pecan >= 0.5.0 %description api OpenStack ceilometer provides services to measure and @@ -568,6 +570,10 @@ fi %changelog +* Wed Nov 19 2014 Daniil Trishkin - 2014.2 +- Update to upstream 2014.2 +- Update requirements + * Fri Jul 4 2014 Ivan Berezovskiy - 2014.2.b1 - Update to upstream 2014.2.b1 - Update requirements diff --git a/tests/runtests.sh b/tests/runtests.sh index 86255b7..82aadc1 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -47,6 +47,23 @@ prepare_vm() { yum install screen rabbitmq-server python-pip sqlite -y fi service rabbitmq-server restart + + for (( i = 1; i <= 5; i++ )) + { + if echo "$(service rabbitmq-server status)" | grep -q "Error: unable to connect to node"; + then + service rabbitmq-server start + if [ "$i" -eq 5 ] + then + echo "rabbitmq-server is dead" + exit 1 + fi + else + echo "$(service rabbitmq-server status)" + break + fi + } + sleep 5 } -- 2.32.3