From: Christian Trautman <ctrautma@redhat.com>
Date: Mon, 26 Mar 2018 12:41:54 +0000 (-0400)
Subject: rhel_epel_fix: Fix installation of spel for sshpass
X-Git-Tag: opnfv-6.0.0~11
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3c2794471edd1a931dfdac31a32a4087d40f5289;p=vswitchperf.git

rhel_epel_fix: Fix installation of spel for sshpass

RHEL does not have an epel-release package available from default repos.
Removes this install to use fedora epel release to allow sshpass to install
correctly.

Change-Id: Ie313857420cb4eb2342128b5d11e769670ae70a0
Signed-off-by: Christian Trautman <ctrautma@redhat.com>
---

diff --git a/systems/rhel/7.2/build_base_machine.sh b/systems/rhel/7.2/build_base_machine.sh
index d3f74726..198f39d7 100755
--- a/systems/rhel/7.2/build_base_machine.sh
+++ b/systems/rhel/7.2/build_base_machine.sh
@@ -53,7 +53,6 @@ pkglist=(
  numactl\
  numactl-devel\
  libpng-devel\
- epel-release\
  sshpass\
 )
 
@@ -63,6 +62,9 @@ pkglist=(
  python-six\
 )
 
+# install RHEL compatible epel for sshpass
+yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+
 # Iterate installing each package. If packages fail to install, record those
 # packages and exit with an error message on completion. Customer may need to
 # add repo locations and subscription levels.
diff --git a/systems/rhel/7.3/build_base_machine.sh b/systems/rhel/7.3/build_base_machine.sh
index dfa738df..ae527214 100755
--- a/systems/rhel/7.3/build_base_machine.sh
+++ b/systems/rhel/7.3/build_base_machine.sh
@@ -53,7 +53,6 @@ pkglist=(
  numactl\
  numactl-devel\
  libpng-devel\
- epel-release\
  sshpass\
 )
 
@@ -63,6 +62,9 @@ pkglist=(
  python-six\
 )
 
+# install RHEL compatible epel for sshpass
+yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+
 # Iterate installing each package. If packages fail to install, record those
 # packages and exit with an error message on completion. Customer may need to
 # add repo locations and subscription levels.