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>
---
 ci/dev_dep_check.sh    | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++
 ci/dev_deploy_check.sh | 53 ------------------------------------
 2 files changed, 74 insertions(+), 53 deletions(-)
 create mode 100755 ci/dev_dep_check.sh
 delete mode 100755 ci/dev_deploy_check.sh

(limited to 'ci')

diff --git a/ci/dev_dep_check.sh b/ci/dev_dep_check.sh
new file mode 100755
index 00000000..a15eb8b9
--- /dev/null
+++ b/ci/dev_dep_check.sh
@@ -0,0 +1,74 @@
+#!/bin/sh
+##############################################################################
+# Copyright (c) 2016 Dan Radez (Red Hat) and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+# This script makes sure deploy deps are installed when not relying on RPM
+
+set -e
+
+rdo_action="update"
+
+# check for rdo-release
+if ! rpm -q rdo-release > /dev/null; then
+    rdo_action="install"
+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..."
+    exit 1
+fi
+
+# update ipxe-roms-qemu
+if ! sudo yum update -y ipxe-roms-qemu; then
+    echo "Failed to update ipxe-roms-qemu package..."
+    exit 1
+fi
+
+# check for other packages
+for i in epel-release python34-PyYAML openvswitch openstack-tripleo libguestfs libguestfs-tools-c libvirt-python; do
+# Make sure deploy deps are installed
+    if ! rpm -q $i > /dev/null; then
+        if ! sudo yum install -y $i; then
+            echo "Failed to install $i package..."
+            exit 1
+        fi
+    fi
+done
+
+# install pip dependencies
+easy_install-3.4 pip
+sudo pip3 install python-ipmi
+
+# Make sure jinja2 is installed
+easy_install-3.4 jinja2
+
+# TODO(cgoncalves): remove once congress RPM is downloaded from upstream
+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
diff --git a/ci/dev_deploy_check.sh b/ci/dev_deploy_check.sh
deleted file mode 100755
index 0ce135ad..00000000
--- a/ci/dev_deploy_check.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-##############################################################################
-# Copyright (c) 2016 Dan Radez (Red Hat) and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-# This script makes sure deploy deps are installed when not relying on RPM
-
-set -e
-
-rdo_action="update"
-
-# check for rdo-release
-if ! rpm -q rdo-release > /dev/null; then
-    rdo_action="install"
-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..."
-    exit 1
-fi
-
-# update ipxe-roms-qemu
-if ! sudo yum update -y ipxe-roms-qemu; then
-    echo "Failed to update ipxe-roms-qemu package..."
-    exit 1
-fi
-
-# check for other packages
-for i in epel-release python34-PyYAML openvswitch openstack-tripleo libguestfs libguestfs-tools-c libvirt-python; do
-# Make sure deploy deps are installed
-    if ! rpm -q $i > /dev/null; then
-        if ! sudo yum install -y $i; then
-            echo "Failed to install $i package..."
-            exit 1
-        fi
-    fi
-done
-
-# install pip dependencies
-easy_install-3.4 pip
-sudo pip3 install python-ipmi
-
-# Make sure jinja2 is installed
-easy_install-3.4 jinja2
-
-# TODO(cgoncalves): remove once congress RPM is downloaded from upstream
-easy_install-3.4 tox
-- 
cgit 1.2.3-korg