Merge "Adjust package installation for openSUSE"

This commit is contained in:
Jenkins 2017-06-05 05:01:21 +00:00 committed by Gerrit Code Review
commit f9aa27e117
2 changed files with 11 additions and 1 deletions

View File

@ -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]

View File

@ -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 \