From 0647a062ba1260820e3b94a4c510a4b16a218528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Wed, 23 Oct 2019 11:25:15 +0200 Subject: [PATCH] Do not build rally image for Ubuntu binary UCA does not provide rally and the Ubuntu rally depends on python2 packages which conflict with python3 packages. Change-Id: I36c1feaecf2e07e2d9fb8a7f42e899477eaabae4 Closes-bug: #1848295 --- doc/source/matrix_aarch64.csv | 2 +- doc/source/matrix_x86.csv | 2 +- kolla/image/build.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index 0e799bd017..28a7c97ade 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -74,7 +74,7 @@ qdrouterd,C,C,C,C,N,N qinling,N,C,N,C,N,C rabbitmq,C,C,C,C,N,C radvd,C,C,C,C,N,C -rally,C,C,C,C,N,C +rally,C,C,N,C,N,C redis,C,C,C,C,N,C rsyslog,C,C,C,C,N,C sahara,C,C,C,C,N,C diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index 220546a72d..2aa5fecb4a 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -74,7 +74,7 @@ qdrouterd,C,C,N,N,N,N qinling,N,C,N,C,N,C rabbitmq,T,T,T,T,N,T radvd,C,C,C,C,N,C -rally,C,C,C,C,N,C +rally,C,C,N,C,N,C redis,C,T,C,C,N,C rsyslog,C,C,C,C,N,C sahara,C,C,C,C,N,C diff --git a/kolla/image/build.py b/kolla/image/build.py index 0cd9274c5c..7ab1bd33bb 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -210,6 +210,7 @@ UNBUILDABLE_IMAGES = { "heat-all", "ironic-neutron-agent", "novajoin-base", + "rally", "tacker-base", "tripleoclient", "vitrage-base",