diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-12-14 18:34:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-14 18:34:53 +0000 |
| commit | 7b6a6ab8088902a20678541195867388d38423e7 (patch) | |
| tree | 7ea5ba4a5b9ffa7c34bf3c3e391e8b16c21b4eee | |
| parent | de26589a32a3a522cbeb52c1f82ec7e4f000cff3 (diff) | |
| parent | 5628a39f3ac6e5315a9b0956ae52c5c23b4321b1 (diff) | |
Merge "Download always all packages to reduce dependence clash"
| -rwxr-xr-x | ci/dev_dep_check.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ci/dev_dep_check.sh b/ci/dev_dep_check.sh index 6814227e..2a6266c0 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 |