Merge "Add support for mistral ubuntu binary containers"

docker/mistral/mistral-api/Dockerfile.j2

@@ -8,6 +8,12 @@ RUN yum -y install \
         openstack-mistral-api \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get -y install --no-install-recommends \
+        mistral-api \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 

docker/mistral/mistral-base/Dockerfile.j2

@@ -11,8 +11,9 @@ RUN yum -y install \
 
     {% elif base_distro in ['ubuntu'] %}
 
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+RUN apt-get -y install --no-install-recommends \
-    && /bin/false
+        mistral-common \
+    && apt-get clean
 
     {% endif %}
 

docker/mistral/mistral-engine/Dockerfile.j2

@@ -8,6 +8,12 @@ RUN yum -y install \
         openstack-mistral-engine \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get -y install --no-install-recommends \
+        mistral-engine \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 

docker/mistral/mistral-executor/Dockerfile.j2

@@ -8,6 +8,12 @@ RUN yum -y install \
         openstack-mistral-executor \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get -y install --no-install-recommends \
+        mistral-executor \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 

tests/test_build.py

@@ -86,8 +86,7 @@ class BuildTestCentosSource(BuildTest, base.BaseTestCase):
 
 
 class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
-    excluded_images = ["mistral-base",
+    excluded_images = ["zaqar"]
-                       "zaqar"]
 
     def setUp(self):
         super(BuildTestUbuntuBinary, self).setUp()