openstack/kolla
Code Issues Proposed changes

enable binary install for Congress

Browse Source 
congress binary package is available in rpm base distro
https://trunk.rdoproject.org/

Change-Id: I4f2f9396925d28322d2d5a625cc96d8a5386b129
This commit is contained in:
caoyuan 2017-03-14 16:48:21 +08:00
parent 18fe77689b
commit 3878f30b31
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/congress/congress-base/Dockerfile.j2
View File

@ -13,14 +13,10 @@ MAINTAINER {{ maintainer }}
'congress-common', 'congress-common',
'congress-server'] 'congress-server']
%} %}
# TODO(Md Nadeem): need to add congress binary package when it is available in rpm base distro
#https://trunk.rdoproject.org/
{% elif base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% elif base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set congress_base_packages = [
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ 'openstack-congress']
&& /bin/false %}
{% endif %} {% endif %}
{{ macros.install_packages(congress_base_packages | customizable("packages")) }} {{ macros.install_packages(congress_base_packages | customizable("packages")) }}

2
tests/test_build.py
View File

@ -67,7 +67,6 @@ class BuildTest(object):
class BuildTestCentosBinary(BuildTest, base.BaseTestCase): class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
excluded_images = [ excluded_images = [
"bifrost-base", "bifrost-base",
"congress-base",
"freezer-base", "freezer-base",
"kafka", "kafka",
"karbor-base", "karbor-base",
@ -143,7 +142,6 @@ class BuildTestUbuntuSource(BuildTest, base.BaseTestCase):
class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase): class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
excluded_images = [ excluded_images = [
"bifrost-base", "bifrost-base",
"congress-base",
"freezer-base", "freezer-base",
"kafka", "kafka",
"karbor-base", "karbor-base",