X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=foreman%2Fci%2Fdeploy.sh;h=31d41d2006002a01a3d4760c9389c75c448cc32a;hb=be75ed95cc956e1ef634d3878148701c21d15b5a;hp=87256cb7c5f6bdc031a4a6311d6de07baa43036f;hpb=7b483cb5ddc4445d5a31886c08694a61bce50636;p=genesis.git

diff --git a/foreman/ci/deploy.sh b/foreman/ci/deploy.sh
index 87256cb..31d41d2 100755
--- a/foreman/ci/deploy.sh
+++ b/foreman/ci/deploy.sh
@@ -186,18 +186,13 @@ done
 ##disable selinux
 /sbin/setenforce 0
 
-##install EPEL
-if ! yum repolist | grep "epel/"; then
-  if ! rpm -Uvh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm; then
-    printf '%s\n' 'deploy.sh: Unable to configure EPEL repo' >&2
-    exit 1
-  fi
-else
-  printf '%s\n' 'deploy.sh: Skipping EPEL repo as it is already configured.'
-fi
+# Install EPEL repo for access to many other yum repos
+# Major version is pinned to force some consistency for Arno
+yum install -y epel-release-7*
 
-##install dependencies
-if ! yum -y install binutils gcc make patch libgomp glibc-headers glibc-devel kernel-headers kernel-devel dkms psmisc; then
+# Install other required packages
+# Major versions are pinned to force some consistency for Arno
+if ! yum install -y binutils-2* gcc-4* make-3* patch-2* libgomp-4* glibc-headers-2* glibc-devel-2* kernel-headers-3* kernel-devel-3* dkms-2* psmisc-22*; then
   printf '%s\n' 'deploy.sh: Unable to install depdency packages' >&2
   exit 1
 fi
@@ -230,7 +225,8 @@ fi
 
 ##install kmod-VirtualBox
 if ! lsmod | grep vboxdrv; then
-  if ! sudo /etc/init.d/vboxdrv setup; then
+  sudo /etc/init.d/vboxdrv setup
+  if ! lsmod | grep vboxdrv; then
     printf '%s\n' 'deploy.sh: Unable to install kernel module for virtualbox' >&2
     exit 1
   fi
@@ -240,7 +236,7 @@ fi
 
 ##install Ansible
 if ! yum list installed | grep -i ansible; then
-  if ! yum -y install ansible; then
+  if ! yum -y install ansible-1*; then
     printf '%s\n' 'deploy.sh: Unable to install Ansible package' >&2
     exit 1
   fi
@@ -282,7 +278,7 @@ rm -rf /tmp/bgs_vagrant
 
 ##clone bgs vagrant
 ##will change this to be opnfv repo when commit is done
-if ! git clone https://github.com/trozet/bgs_vagrant.git; then
+if ! git clone -b v1.0 https://github.com/trozet/bgs_vagrant.git; then
   printf '%s\n' 'deploy.sh: Unable to clone vagrant repo' >&2
   exit 1
 fi
@@ -572,7 +568,7 @@ for node in ${nodes}; do
 
   ##clone bgs vagrant
   ##will change this to be opnfv repo when commit is done
-  if ! git clone https://github.com/trozet/bgs_vagrant.git $node; then
+  if ! git clone -b v1.0 https://github.com/trozet/bgs_vagrant.git $node; then
     printf '%s\n' 'deploy.sh: Unable to clone vagrant repo' >&2
     exit 1
   fi