openstack/deb-python-diskimage-builder
Code Issues Proposed changes

Adjust package installation for openSUSE

Browse Source 
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
This commit is contained in:
Dirk Mueller
2017-05-28 22:59:11 +02:00
parent 016b1f1522
commit 344b1bc5d3
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bindep.txt
View File

@@ -1,5 +1,6 @@
# This is a cross-platform list tracking distribution packages needed by tests; # This is a cross-platform list tracking distribution packages needed by tests;
# see http://docs.openstack.org/infra/bindep/ for additional information. # 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] zypper [!platform:redhat !platform:ubuntu-trusty]
gnupg2 [!platform:redhat !platform:ubuntu-trusty] gnupg2 [!platform:redhat !platform:ubuntu-trusty]

9
tests/install_test_deps.sh
View File

@@ -24,6 +24,15 @@ sudo apt-get install -y --force-yes \
kpartx \ kpartx \
util-linux \ util-linux \
qemu-img || \ qemu-img || \
sudo zypper -n install \
bzip2 \
debootstrap \
docker \
kpartx \
util-linux \
python-pyliblzma \
yum-utils \
qemu-tools || \
sudo emerge \ sudo emerge \
app-arch/bzip2 \ app-arch/bzip2 \
app-emulation/qemu \ app-emulation/qemu \