From 344b1bc5d3300649f384bb53e550f88ad2be57e4 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Sun, 28 May 2017 22:59:11 +0200
Subject: [PATCH] Adjust package installation for openSUSE

On SUSE family distros the squash-tools are simply part of the
main package called "squashfs", so install that one instead. Without
this change bindep on SUSE hosts fails with:

  ERROR: These requested packages were not installed:
  squashfs-tools

Also adjust install_test_deps.sh to install required packages
on an openSUSE host.

Change-Id: I61dcd5314e78dbb1fb31e723799374edd456da99
---
 bindep.txt                 | 3 ++-
 tests/install_test_deps.sh | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/bindep.txt b/bindep.txt
index f737d2bc..5e42b721 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,5 +1,6 @@
 # This is a cross-platform list tracking distribution packages needed by tests;
 # see http://docs.openstack.org/infra/bindep/ for additional information.
-squashfs-tools
+squashfs-tools [!platform:suse]
+squashfs [platform:suse]
 zypper [!platform:redhat !platform:ubuntu-trusty]
 gnupg2 [!platform:redhat !platform:ubuntu-trusty]
diff --git a/tests/install_test_deps.sh b/tests/install_test_deps.sh
index fe85d4ba..cbb429dd 100755
--- a/tests/install_test_deps.sh
+++ b/tests/install_test_deps.sh
@@ -24,6 +24,15 @@ sudo apt-get install -y --force-yes \
         kpartx \
         util-linux \
         qemu-img || \
+    sudo zypper -n install \
+        bzip2 \
+        debootstrap \
+        docker \
+        kpartx \
+        util-linux \
+        python-pyliblzma \
+        yum-utils \
+        qemu-tools || \
     sudo emerge \
         app-arch/bzip2 \
         app-emulation/qemu \