From 0df250e187841b01e2f38e86e380e5ec2003335d Mon Sep 17 00:00:00 2001
From: Dan Radez <dradez@redhat.com>
Date: Thu, 20 Oct 2016 11:06:32 -0400
Subject: Moving custom rpm packages to dev_dep_check

These only need to be installed once so no need to check them every run.

Change-Id: I288fb52625cad1f11b3b3ca7f0f29a30095646f9
Signed-off-by: Dan Radez <dradez@redhat.com>
---
 build/overcloud-full.sh | 17 -----------------
 build/variables.sh      | 12 ------------
 2 files changed, 29 deletions(-)

(limited to 'build')

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 4fd3f1e8..6539edc0 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -172,23 +172,6 @@ git am *.patch
 popd > /dev/null
 tar czf ovs.tar.gz ovs
 
-# Required packages to redirect stdin with virt-customize
-virt_pkg_str="./$libguestfs_pkg "
-wget $virt_uri_base/$libguestfs_pkg
-for package in ${virt_pkgs[@]}; do
-  wget "$virt_uri_base/$package"
-  virt_pkg_str+=" ./$package"
-done
-
-if ! sudo yum -y install ${virt_pkg_str}; then
-  if [ "$(rpm -q libguestfs)" != "$(rpm -qpf $libguestfs_pkg)" ]; then
-    echo "ERROR: Failed to update libguestfs"
-    exit 1
-  fi
-fi
-
-
-
 # BUILD NSH OVS
 LIBGUESTFS_BACKEND=direct virt-customize \
     --upload ../build_ovs_nsh.sh:/root/ \
diff --git a/build/variables.sh b/build/variables.sh
index 6d657186..0251faf2 100644
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -36,15 +36,3 @@ fdio_pkgs=(
 'vpp-python-api-16.09-release.x86_64.rpm'
 )
 honeycomb_pkg='honeycomb-1.16.9-FINAL.noarch.rpm'
-
-virt_uri_base=https://people.redhat.com/~rjones/libguestfs-RHEL-7.3-preview
-libguestfs_pkg='libguestfs-1.32.7-3.el7.x86_64.rpm'
-virt_pkgs=(
-'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'
-)
-- 
cgit 1.2.3-korg