diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-23 16:32:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-23 16:32:14 +0000 |
| commit | 378aa0a7ffaf1fcff801421e59e5c3a149f4c372 (patch) | |
| tree | dc9a883c4e697db5193011e0b8572797f2b18946 | |
| parent | a46806c074caf794f2d04d70bd6ab81226b8b5d5 (diff) | |
| parent | 0647a062ba1260820e3b94a4c510a4b16a218528 (diff) | |
| download | kolla-378aa0a7ffaf1fcff801421e59e5c3a149f4c372.tar.gz kolla-378aa0a7ffaf1fcff801421e59e5c3a149f4c372.zip | |
Merge "Do not build rally image for Ubuntu binary"
| -rw-r--r-- | doc/source/matrix_aarch64.csv | 2 | ||||
| -rw-r--r-- | doc/source/matrix_x86.csv | 2 | ||||
| -rwxr-xr-x | 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 0e799bd01..28a7c97ad 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 220546a72..2aa5fecb4 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 0cd9274c5..7ab1bd33b 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", |