From 8b9db6da8629bd9dfdc70395b2cfe15a3f9d71d6 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 7 Aug 2015 09:21:41 -0400
Subject: [PATCH] Revert "Initial run_tests.sh script"

This reverts commit 2921e36c790dd255b560f322f9444bd6d30be5f6.

Change-Id: I88055528d143325457cdc2461dedb37f703374b9
---
 .gitignore         |  4 ----
 Gemfile            |  6 ++++--
 install_modules.sh | 18 +++++++++++-------
 run_tests.sh       | 42 ------------------------------------------
 4 files changed, 15 insertions(+), 55 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100755 run_tests.sh

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f789f184f..000000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Gemfile.lock
-.bundle/
-.bundled_gems/
-.modules/
diff --git a/Gemfile b/Gemfile
index 102110189..c61bfe11a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,5 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-gem 'r10k'
-
 group :development, :test do
   gem 'puppetlabs_spec_helper',               :require => 'false'
   gem 'rspec-puppet', '~> 2.2.0',             :require => 'false'
@@ -20,10 +18,14 @@ end
 
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion, :require => false
+else
+  gem 'facter', :require => false
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
   gem 'puppet', puppetversion, :require => false
+else
+  gem 'puppet', :require => false
 end
 
 # vim:ft=ruby
diff --git a/install_modules.sh b/install_modules.sh
index 8154c9267..47c57748b 100755
--- a/install_modules.sh
+++ b/install_modules.sh
@@ -1,17 +1,19 @@
-#!/bin/bash -ex
+#!/bin/bash
 
-export SCRIPT_DIR=$(pwd)
-export PUPPETFILE_DIR=${SCRIPT_DIR}/.modules
+set -ex
+
+export SCRIPT_DIR=$(readlink -f "$(dirname $0)")
+export PUPPETFILE_DIR=/etc/puppet/modules
 
 install_external() {
-  PUPPETFILE=${SCRIPT_DIR}/Puppetfile1 ${GEM_HOME}/bin/r10k puppetfile install -v
+  PUPPETFILE=${SCRIPT_DIR}/Puppetfile1 r10k puppetfile install -v
 }
 
 install_openstack() {
   cat > clonemap.yaml <<EOF
 clonemap:
   - name: '(.*?)/puppet-(.*)'
-    dest: '$PUPPETFILE_DIR/\2'
+    dest: '/etc/puppet/modules/\2'
 EOF
 
   local project_names=$(awk '{ if ($1 == ":git") print $3 }' \
@@ -26,9 +28,11 @@ EOF
 }
 
 install_all() {
-  PUPPETFILE=${SCRIPT_DIR}/Puppetfile ${GEM_HOME}/bin/r10k puppetfile install -v
+  PUPPETFILE=${SCRIPT_DIR}/Puppetfile r10k puppetfile install -v
 }
 
+gem install r10k --no-ri --no-rdoc
+
 # If zuul-cloner is there, have it install modules using zuul refs
 if [ -e /usr/zuul-env/bin/zuul-cloner ] ; then
   csplit ${SCRIPT_DIR}/Puppetfile /'External modules'/ \
@@ -40,4 +44,4 @@ else
   install_all
 fi
 
-puppet module list --color=false
+puppet module list
diff --git a/run_tests.sh b/run_tests.sh
deleted file mode 100755
index 7cec53961..000000000
--- a/run_tests.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash -e
-# Copyright 2015 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-if [ -z $GEM_HOME ]; then
-    echo "Warning! \$GEM_HOME is not set"
-    echo ""
-    echo "In order to properly run the integration tests, please run the"
-    echo "following:"
-    echo ""
-    echo "  $ export GEM_HOME=\`pwd\`/.bundled_gems"
-    exit 1
-fi
-
-if ! [ -f $GEM_HOME ]; then
-    mkdir -p $GEM_HOME
-fi
-
-BUNDLE=${GEM_HOME}/bin/bundle
-
-if ! [ -f ${BUNDLE} ]; then
-    echo "Warning! bundler is not installed"
-    echo ""
-    echo "Please run the following to install bundler:"
-    echo "  $ gem install bundler"
-    exit 1
-fi
-
-${BUNDLE} install --no-color --without development test system_tests
-
-./install_modules.sh