diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-15 14:55:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-15 14:55:04 +0000 |
| commit | 3a7510e65e7f4ab0993ca170b9b59a67c004c90c (patch) | |
| tree | 70331dd05954122390a3ba8c5fa93c0d7c13b723 | |
| parent | e3504d06f9c2514cdec7478e37efa8328c346765 (diff) | |
| parent | 3878f30b314a8696882322136dc9d26b27c44626 (diff) | |
| download | kolla-3a7510e65e7f4ab0993ca170b9b59a67c004c90c.tar.gz kolla-3a7510e65e7f4ab0993ca170b9b59a67c004c90c.zip | |
Merge "enable binary install for Congress"
| -rw-r--r-- | docker/congress/congress-base/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | tests/test_build.py | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/docker/congress/congress-base/Dockerfile.j2 b/docker/congress/congress-base/Dockerfile.j2 index 59376fdfa..164878da9 100644 --- a/docker/congress/congress-base/Dockerfile.j2 +++ b/docker/congress/congress-base/Dockerfile.j2 @@ -13,14 +13,10 @@ MAINTAINER {{ maintainer }} 'congress-common', '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'] %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - + {% set congress_base_packages = [ + 'openstack-congress'] + %} {% endif %} {{ macros.install_packages(congress_base_packages | customizable("packages")) }} diff --git a/tests/test_build.py b/tests/test_build.py index 0db8c19e9..16c4d25f3 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -67,7 +67,6 @@ class BuildTest(object): class BuildTestCentosBinary(BuildTest, base.BaseTestCase): excluded_images = [ "bifrost-base", - "congress-base", "freezer-base", "kafka", "karbor-base", @@ -181,7 +180,6 @@ class BuildTestDebianSource(BuildTest, base.BaseTestCase): class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase): excluded_images = [ "bifrost-base", - "congress-base", "freezer-base", "kafka", "karbor-base", |