From 32ea1aab493a069b056efaaf481fc5d459d48ecf Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 7 Mar 2019 13:47:36 +0000 Subject: monasca, tempest: install librdkafka-dev to get it built for non-x86/source fixes build issue under Debian:buster on AArch64: In file included from confluent_kafka/src/confluent_kafka.c:17: confluent_kafka/src/confluent_kafka.h:22:10: fatal error: librdkafka/rdkafka.h: No such file or directory #include ^~~~~~~~~~~~~~~~~~~~~~ compilation terminated. error: command 'aarch64-linux-gnu-gcc' failed with exit status 1 Under Ubuntu it is still broken because librdkafka is too old. Change-Id: I1e54645ea5805f985c9bd04f9936ea3edbebfd31 --- docker/monasca/monasca-base/Dockerfile.j2 | 1 + docker/tempest/Dockerfile.j2 | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2 index 6adc1a91b..2757605c6 100644 --- a/docker/monasca/monasca-base/Dockerfile.j2 +++ b/docker/monasca/monasca-base/Dockerfile.j2 @@ -29,6 +29,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% set monasca_base_packages = [ 'apache2', 'libapache2-mod-wsgi', + 'librdkafka-dev' ] %} {{ macros.install_packages(monasca_base_packages | customizable("packages")) }} diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index b84841afb..c2c16e15a 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -27,6 +27,13 @@ RUN ln -sf /var/lib/tempest /tempest ADD tempest-archive /tempest-source ADD plugins-archive / +{% if base_package_type == 'deb' and base_arch not in ['x86_64'] %} + {% set tempest_source_packages = ['librdkafka-dev'] %} + +{{ macros.install_packages(tempest_source_packages | customizable("source_packages")) }} +{% endif %} + + {% set tempest_pip_packages = [ '/tempest' ] %} -- cgit v1.2.3