From ae139bdf534f788cce6590c99866d31ef1269d93 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Mon, 26 Jun 2017 13:45:29 +0000
Subject: [PATCH] Updated from OpenStack Ansible Tests

Change-Id: Ifc606a869f6f1160f3bffbc52bebc7115bfef225
---
 .gitignore   |  3 ++-
 Vagrantfile  |  9 +++++++++
 run_tests.sh | 18 ++++++++++++++++--
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e0952ec..5421f90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,4 +67,5 @@ tests/*.retry
 # Vagrant artifacts
 .vagrant
 
-
+# Git clones
+openstack-ansible-ops
diff --git a/Vagrantfile b/Vagrantfile
index 0618ee2..436f459 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,3 +1,11 @@
+# Verify whether required plugins are installed.
+required_plugins = [ "vagrant-disksize" ]
+required_plugins.each do |plugin|
+  if not Vagrant.has_plugin?(plugin)
+    raise "The vagrant plugin #{plugin} is required. Please run `vagrant plugin install #{plugin}`"
+  end
+end
+
 Vagrant.configure(2) do |config|
   config.vm.provider "virtualbox" do |v|
     v.memory = 2048
@@ -12,6 +20,7 @@ Vagrant.configure(2) do |config|
       SHELL
 
   config.vm.define "ubuntu1604" do |xenial|
+    xenial.disksize.size = "40GB"
     xenial.vm.box = "ubuntu/xenial64"
   end
 
diff --git a/run_tests.sh b/run_tests.sh
index d88b2d1..969e3db 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -21,8 +21,15 @@
 # prepare the host and then execute all the tox tests.
 #
 
+## Shell Opts ----------------------------------------------------------------
 set -xeu
 
+## Vars ----------------------------------------------------------------------
+
+export WORKING_DIR=${WORKING_DIR:-$(pwd)}
+
+## Main ----------------------------------------------------------------------
+
 source /etc/os-release || source /usr/lib/os-release
 
 install_pkg_deps() {
@@ -41,7 +48,15 @@ install_pkg_deps() {
 
 git_clone_repo() {
     if [[ ! -d tests/common ]]; then
-        git clone https://git.openstack.org/openstack/openstack-ansible-tests tests/common
+        # The tests repo doesn't need a clone, we can just
+        # symlink it.
+        if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then
+            ln -s ${WORKING_DIR} ${WORKING_DIR}/tests/common
+        else
+            git clone \
+                https://git.openstack.org/openstack/openstack-ansible-tests \
+                tests/common
+        fi
     fi
 }
 
@@ -52,4 +67,3 @@ git_clone_repo
 # start executing the main test script
 source tests/common/run_tests_common.sh
 
-# vim: set ts=4 sw=4 expandtab: