From fc7eb5a9c75bd4dcc288a79658a83ef8a0ee6929 Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Tue, 18 Sep 2018 12:42:52 +0200 Subject: [PATCH] Test Fix ceilometer source builds Remove ceilometer from constraints to fix the build. Change-Id: I992cf177944df8da3026a8b3deabf5f10051959c --- docker/ceilometer/ceilometer-base/Dockerfile.j2 | 2 ++ docker/neutron/neutron-server-opendaylight/Dockerfile.j2 | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 4f6a605306..a2ada08664 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -39,7 +39,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ADD ceilometer-base-archive /ceilometer-base-source ADD plugins-archive / +# NOTE(egonzalez): Remove ceilometer from constraint or will fail. RUN ln -s ceilometer-base-source/* ceilometer \ + && sed -i 's|^ceilometer===.*$||g' requirements/upper-constraints.txt \ && {{ macros.install_pip(ceilometer_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/ceilometer \ && cp -r /ceilometer/etc/ceilometer/* /etc/ceilometer/ \ diff --git a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 index d30e826c49..6b4f800827 100644 --- a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 +++ b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 @@ -45,7 +45,8 @@ ADD plugins-archive / ] %} RUN if [ "$(ls /plugins)" ]; then \ - {{ macros.install_pip(neutron_server_opendaylight_plugins_pip_packages) }}; \ + sed -i 's|^ceilometer===.*$||g' requirements/upper-constraints.txt \ + && {{ macros.install_pip(neutron_server_opendaylight_plugins_pip_packages) }}; \ fi {% endif %}