diff options
| -rw-r--r-- | docker/manila/manila-data/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | tests/test_build.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2 index 8878d1acb..b1777bfae 100644 --- a/docker/manila/manila-data/Dockerfile.j2 +++ b/docker/manila/manila-data/Dockerfile.j2 @@ -8,8 +8,13 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + + {% elif base_distro in ['ubuntu'] %} + {% set manila_data_packages = [ - 'manila-data' + 'manila-data' ] %} {{ macros.install_packages(manila_data_packages | customizable("packages")) }} diff --git a/tests/test_build.py b/tests/test_build.py index 1a89821e0..db2cf3713 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -70,6 +70,7 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase): "searchlight-base", "senlin-base", "vmtp", + "manila-data", "watcher-base", "congress-base", "bifrost-base", @@ -123,6 +124,7 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase): "searchlight-base", "senlin-base", "vmtp", + "manila-data", "watcher-base", "congress-base", "bifrost-base", |