From 2831a7e580e0ee85ff9dbb225a38e5741671542e Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Wed, 20 Nov 2019 10:10:14 +0100 Subject: [PATCH] Remove libbluetooth / bluez from the CI tests Since the bluetooth code has been removed, we don't need to test with this library anymore. Message-Id: <20191120091014.16883-5-thuth@redhat.com> Acked-by: Paolo Bonzini Signed-off-by: Thomas Huth --- .gitlab-ci.yml | 2 +- tests/docker/dockerfiles/fedora.docker | 1 - tests/docker/dockerfiles/ubuntu.docker | 1 - tests/docker/dockerfiles/ubuntu1804.docker | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 62a9609798..e3db1b847c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ build-disabled: build-tcg-disabled: script: - - apt-get install -y -qq clang libgtk-3-dev libbluetooth-dev libusb-dev + - apt-get install -y -qq clang libgtk-3-dev libusb-dev - ./configure --cc=clang --enable-werror --disable-tcg --audio-drv-list="" - make -j2 - make check-unit diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 47732fc5d5..51d475e6be 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -2,7 +2,6 @@ FROM fedora:30 ENV PACKAGES \ bc \ bison \ - bluez-libs-devel \ brlapi-devel \ bzip2 \ bzip2-devel \ diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index ecea155646..18f1100409 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -19,7 +19,6 @@ ENV PACKAGES flex bison \ glusterfs-common \ libaio-dev \ libattr1-dev \ - libbluetooth-dev \ libbrlapi-dev \ libbz2-dev \ libcacard-dev \ diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 32a607471a..0766f94cf4 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -8,7 +8,6 @@ ENV PACKAGES flex bison \ glusterfs-common \ libaio-dev \ libattr1-dev \ - libbluetooth-dev \ libbrlapi-dev \ libbz2-dev \ libcacard-dev \ -- 2.11.4.GIT