summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNikolas Hermanns <nikolas.hermanns@ericsson.com>2016-12-09 08:11:05 +0100
committerNikolas Hermanns <nikolas.hermanns@ericsson.com>2016-12-14 13:37:00 +0100
commit5628a39f3ac6e5315a9b0956ae52c5c23b4321b1 (patch)
treedb8cf1bd283d8047c8900a4bcbdb08a17f5919f5 /ci
parentcd451be320c5efa92aec2f6a8fcd31e330dd2857 (diff)
Download always all packages to reduce dependence clash
Change-Id: I4d7cde89f5ba1585339c53aeb166e5bb6a9f5575 Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/dev_dep_check.sh10
1 files changed, 4 insertions, 6 deletions
diff --git a/ci/dev_dep_check.sh b/ci/dev_dep_check.sh
index 6814227..2a6266c 100755
--- a/ci/dev_dep_check.sh
+++ b/ci/dev_dep_check.sh
@@ -32,7 +32,7 @@ if ! sudo yum update -y ipxe-roms-qemu; then
fi
# check for other packages
-for i in epel-release python34-PyYAML openvswitch openstack-tripleo libguestfs libguestfs-tools-c libvirt-python python2-oslo-config python2-debtcollector python34-devel; do
+for i in epel-release python34-PyYAML openvswitch openstack-tripleo libguestfs libguestfs-tools-c libvirt-python python2-oslo-config python2-debtcollector python34-devel libxslt-devel libxml2-devel; do
# Make sure deploy deps are installed
if ! rpm -q $i > /dev/null; then
if ! sudo yum install -y $i; then
@@ -69,12 +69,10 @@ mkdir -p $dir
pushd $dir
all_packages=""
for pkg in ${virt_pkgs[@]}; do
- if ! rpm -q ${pkg%-*-*}; then
- if ! wget $virt_uri_base/$pkg; then
- echo "ERROR: Failed to download $pkg"
- fi
- all_packages="$all_packages $pkg"
+ if ! wget $virt_uri_base/$pkg; then
+ echo "ERROR: Failed to download $pkg"
fi
+ all_packages="$all_packages $pkg"
done
if [[ $all_packages != "" ]];then
yum install -y $all_packages