From 345f0555bcae10056b0ef6a79d32cc124f07d5a2 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 9 Apr 2020 08:10:33 +0000 Subject: kibana/debian: use upstream package on all architectures Upstream kibana package ships x86_64 binaries of NodeJS. I usually repacked package without them to have something for other architectures. Instead let us install upstream. Then on non-x86 archs we add nodejs from distribution and remove x86-64 binaries. Change-Id: Ia9feac726a60250215b1bc78bf90dc68ac6f956a --- kolla/image/build.py | 1 + kolla/template/repos.yaml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kolla') diff --git a/kolla/image/build.py b/kolla/image/build.py index abba38c0f..39b861200 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -165,6 +165,7 @@ UNBUILDABLE_IMAGES = { }, 'ubuntu+aarch64': { + "kibana", # no binary package "sensu-base", # no binary package }, diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 1ed325141..2907fc200 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -57,7 +57,7 @@ debian-aarch64: erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./" grafana: "deb https://packages.grafana.com/oss/deb stable main" influxdb: "deb https://repos.influxdata.com/debian buster stable" - kibana: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./" + kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./" rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ buster main" @@ -79,7 +79,6 @@ ubuntu-aarch64: erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-bionic ./" grafana: "deb https://packages.grafana.com/oss/deb stable main" influxdb: "deb https://repos.influxdata.com/ubuntu bionic stable" - kibana: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./" mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main" rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main" -- cgit v1.2.3