From 0686d2b1c9f228e04f8b6e6ca4c5dadd3ee304fc Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Fri, 3 Mar 2017 10:37:45 -0500
Subject: Removes hardcoded packages from dev_deploy_check

The package versions we were downloading as beta are no longer required.
Those versions are now included in epel, so we can just use the repo.

Change-Id: I422afe675e001a1a405c92eb8f0561b7d216badf
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 ci/dev_dep_check.sh | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

(limited to 'ci')

diff --git a/ci/dev_dep_check.sh b/ci/dev_dep_check.sh
index 2a6266c0..6d0aa11f 100755
--- a/ci/dev_dep_check.sh
+++ b/ci/dev_dep_check.sh
@@ -53,29 +53,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'
-)
-dir=/tmp/packages.$RANDOM
-mkdir -p $dir
-pushd $dir
-all_packages=""
-for pkg in ${virt_pkgs[@]}; do
-    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
+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
-rm -rf $dir
-popd
-- 
cgit 1.2.3-korg