Merge "Enable manila-data for rpm binary"
This commit is contained in:
commit
ffbd1040c7
|
@ -6,12 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{% import "macros.j2" as macros with context %}
|
{% import "macros.j2" as macros with context %}
|
||||||
|
|
||||||
{% if install_type == 'binary' %}
|
{% if install_type == 'binary' %}
|
||||||
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
{% if base_distro in ['debian', 'ubuntu'] %}
|
||||||
|
|
||||||
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
|
||||||
&& /bin/false
|
|
||||||
|
|
||||||
{% elif base_distro in ['debian', 'ubuntu'] %}
|
|
||||||
|
|
||||||
{% set manila_data_packages = [
|
{% set manila_data_packages = [
|
||||||
'manila-data'
|
'manila-data'
|
||||||
|
|
|
@ -79,7 +79,6 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
|
||||||
"kafka",
|
"kafka",
|
||||||
"karbor-base",
|
"karbor-base",
|
||||||
"kuryr-base",
|
"kuryr-base",
|
||||||
"manila-data",
|
|
||||||
"monasca-base",
|
"monasca-base",
|
||||||
"neutron-bgp-dragent",
|
"neutron-bgp-dragent",
|
||||||
"neutron-sfc-agent",
|
"neutron-sfc-agent",
|
||||||
|
@ -209,7 +208,6 @@ class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
|
||||||
"kafka",
|
"kafka",
|
||||||
"karbor-base",
|
"karbor-base",
|
||||||
"kuryr-base",
|
"kuryr-base",
|
||||||
"manila-data",
|
|
||||||
"monasca-base",
|
"monasca-base",
|
||||||
"neutron-bgp-dragent",
|
"neutron-bgp-dragent",
|
||||||
"neutron-sfc-agent",
|
"neutron-sfc-agent",
|
||||||
|
|
Loading…
Reference in New Issue