Merge "Fix rdo-release for newton" into stable/danube

[apex.git] / ci / dev_dep_check.sh

diff --git a/ci/dev_dep_check.sh b/ci/dev_dep_check.sh
index a15eb8b..86e6fd9 100755 (executable)
--- a/ci/dev_dep_check.sh
+++ b/ci/dev_dep_check.sh
@@ -12,16 +12,14 @@
 
 set -e
 
-rdo_action="update"
-
 # check for rdo-release
 if ! rpm -q rdo-release > /dev/null; then
-    rdo_action="install"
+    sudo yum remove rdo-release
 fi
 
 # make sure rdo release
-if ! sudo yum $rdo_action -y  https://www.rdoproject.org/repos/rdo-release.rpm; then
-    echo "Failed to $rdo_action RDO Release package..."
+if ! sudo yum install -y  https://repos.fedorapeople.org/repos/openstack/openstack-newton/rdo-release-newton-5.noarch.rpm; then
+    echo "Failed to install RDO Release package..."
     exit 1
 fi
 
@@ -32,7 +30,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; 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
@@ -53,22 +51,7 @@ easy_install-3.4 jinja2
 easy_install-3.4 tox
 
 # Required packages to redirect stdin with virt-customize
-virt_uri_base=https://people.redhat.com/~rjones/libguestfs-RHEL-7.3-preview
-virt_pkgs=(
-'libguestfs-1.32.7-3.el7.x86_64.rpm'
-'libguestfs-tools-1.32.7-3.el7.noarch.rpm'
-'libguestfs-tools-c-1.32.7-3.el7.x86_64.rpm'
-'supermin-5.1.16-4.el7.x86_64.rpm'
-'supermin5-5.1.16-4.el7.x86_64.rpm'
-'supermin-helper-5.1.16-4.el7.x86_64.rpm'
-'perl-Sys-Guestfs-1.32.7-3.el7.x86_64.rpm'
-'python-libguestfs-1.32.7-3.el7.x86_64.rpm'
-)
-
-for pkg in ${virt_pkgs[@]}; do
-    if ! rpm -q ${pkg%-*-*}; then
-        if ! sudo yum -y install $virt_uri_base/$pkg; then
-            echo "ERROR: Failed to update $pkg"
-        fi
-    fi
-done
+if ! sudo yum -y install libguestfs libguestfs-tools libguestfs-tools-c supermin supermin5 supermin-helper perl-Sys-Guestfs python-libguestfs; then
+    echo "Failed to install supermin/libguestfs packages..."
+    exit 1
+fi