From 3c3d567d33931213ac862e04a740bcf6d7e72c35 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 11 Dec 2019 10:30:29 +0100 Subject: skydive: mark as unbuildable on !x86 Ie586b0f249e545877ab1dd156d08e1863cd479ba removed use of rpm packages so it is time to disable building for non-x86 platforms. Upstream provides own container images for several architectures. Change-Id: I4778db57dae0953f5c7116105466c2830592b514 --- doc/source/matrix_aarch64.csv | 2 +- kolla/image/build.py | 10 ++-------- releasenotes/notes/skydive-remove-58bbea2626c59aea.yaml | 5 +++++ 3 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 releasenotes/notes/skydive-remove-58bbea2626c59aea.yaml diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index c5d28a7c2..41e3322a4 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -75,7 +75,7 @@ sahara,C,C,C,C,N,C searchlight,N,C,N,C,N,C senlin,C,C,C,C,N,C sensu,C,C,N,N,N,N -skydive,C,C,N,N,N,N +skydive,N,N,N,N,N,N solum,N,C,N,C,N,C storm,C,C,C,C,N,C swift,C,C,C,C,N,C diff --git a/kolla/image/build.py b/kolla/image/build.py index 6c76eeb6b..45b534537 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -88,6 +88,7 @@ UNBUILDABLE_IMAGES = { "monasca-grafana", # no phantomJS on aarch64 "opendaylight", # no binary package "prometheus-mtail", # no aarch64 binary + "skydive-base", # no aarch64 binary "telegraf", # no binary package }, @@ -99,6 +100,7 @@ UNBUILDABLE_IMAGES = { "monasca-grafana", # no phantomJS "opendaylight", # no binary package "prometheus-base", # no ppc64le binaries + "skydive-base", # no ppc64le binaries "telegraf", # no binary package "xtrabackup", # no binary package }, @@ -157,20 +159,12 @@ UNBUILDABLE_IMAGES = { "qdrouterd", # There is no qdrouterd package for ubuntu bionic }, - 'debian+aarch64': { - "skydive-base", # no binary package - }, 'ubuntu+aarch64': { "sensu-base", # no binary package - "skydive-base", # no binary package }, - 'debian+ppc64le': { - "skydive-base", # no binary package - }, 'ubuntu+ppc64le': { "sensu-base", # no binary package - "skydive-base", # no binary package }, 'centos+aarch64': { diff --git a/releasenotes/notes/skydive-remove-58bbea2626c59aea.yaml b/releasenotes/notes/skydive-remove-58bbea2626c59aea.yaml new file mode 100644 index 000000000..882037a90 --- /dev/null +++ b/releasenotes/notes/skydive-remove-58bbea2626c59aea.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Remove of Skydive image for aarch64 and ppc64le. Upstream builds own images + for wide selection of architectures. Binaries are provided only for x86-64. -- cgit v1.2.3