openstack/kolla-ansible
Code Issues Proposed changes

Merge "Update gnocchi for centos binary"

Browse Source
This commit is contained in:
Jenkins 2016-03-10 21:50:46 +00:00 committed by Gerrit Code Review
commit 89938f9b67
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/gnocchi/gnocchi-base/Dockerfile.j2
View File

@ -2,10 +2,13 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ RUN yum install -y \
&& /bin/false openstack-gnocchi-common \
&& yum clean all
{% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['ubuntu', 'debian'] %} {% if base_distro in ['ubuntu', 'debian'] %}

6
tests/test_build.py
View File

@ -67,8 +67,7 @@ class BuildTest(object):
class BuildTestCentosBinary(BuildTest, base.BaseTestCase): class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
excluded_images = ["gnocchi-base", excluded_images = ["murano-base",
"murano-base",
"ironic-pxe", "ironic-pxe",
"ironic-inspector", "ironic-inspector",
"mistral-base", "mistral-base",
@ -103,8 +102,7 @@ class BuildTestUbuntuSource(BuildTest, base.BaseTestCase):
class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase): class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
excluded_images = ["gnocchi-base", excluded_images = ["murano-base",
"murano-base",
"ironic-pxe", "ironic-pxe",
"ironic-inspector", "ironic-inspector",
"mistral-base", "mistral-base",