From: Markos Chandras <mchandras@suse.de>
Date: Thu, 31 Aug 2017 17:46:07 +0000 (+0100)
Subject: xci: Move Vagrantfile to root directory
X-Git-Tag: 6.0.0~320
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F41611%2F2;p=releng-xci.git

xci: Move Vagrantfile to root directory

We need access to the entire releng-xci directory so we can use the
OPNFV_RELENG_DEV_PATH variable to use modified files for testing
purposes so we move the Vagrantfile to the root directory.

Change-Id: I941b6f2efff479024ff580c3d58fcdcbadd9aa7f
Signed-off-by: Markos Chandras <mchandras@suse.de>
---

diff --git a/xci/Vagrantfile b/Vagrantfile
similarity index 94%
rename from xci/Vagrantfile
rename to Vagrantfile
index 908f5d5e..78aa8d75 100644
--- a/xci/Vagrantfile
+++ b/Vagrantfile
@@ -44,8 +44,9 @@ Vagrant.configure(2) do |config|
           export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-2048}
           export VM_DOMAIN_TYPE=qemu
           export PATH=$PATH:$HOME/.local/bin
+          export OPNFV_RELENG_DEV_PATH=/vagrant
           [[ ! -e ${HOME}/.ssh/id_rsa ]] && ssh-keygen -q -P '' -f ${HOME}/.ssh/id_rsa
-          ./xci-deploy.sh
+          cd xci && ./xci-deploy.sh
       SHELL
       s.env = {
           "XCI_FLAVOR" => "#{ENV['XCI_FLAVOR']}",
@@ -78,8 +79,9 @@ Vagrant.configure(2) do |config|
           export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-2048}
           export VM_DOMAIN_TYPE=qemu
           export PATH=$PATH:$HOME/.local/bin
+          export OPNFV_RELENG_DEV_PATH=/vagrant
           [[ ! -e ${HOME}/.ssh/id_rsa ]] && ssh-keygen -q -P '' -f ${HOME}/.ssh/id_rsa
-          ./xci-deploy.sh
+          cd xci && ./xci-deploy.sh
       SHELL
       s.env = {
           "XCI_FLAVOR" => "#{ENV['XCI_FLAVOR']}",
@@ -110,8 +112,9 @@ Vagrant.configure(2) do |config|
         export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-2048}
         export VM_DOMAIN_TYPE=qemu
         export PATH=$PATH:$HOME/.local/bin
+        export OPNFV_RELENG_DEV_PATH=/vagrant
         [[ ! -e ${HOME}/.ssh/id_rsa ]] && ssh-keygen -q -P '' -f ${HOME}/.ssh/id_rsa
-        ./xci-deploy.sh
+        cd xci && ./xci-deploy.sh
       SHELL
     end
   end
@@ -136,8 +139,9 @@ Vagrant.configure(2) do |config|
         export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-2048}
         export VM_DOMAIN_TYPE=qemu
         export PATH=$PATH:$HOME/.local/bin
+        export OPNFV_RELENG_DEV_PATH=/vagrant
         [[ ! -e ${HOME}/.ssh/id_rsa ]] && ssh-keygen -q -P '' -f ${HOME}/.ssh/id_rsa
-        ./xci-deploy.sh
+        cd xci && ./xci-deploy.sh
       SHELL
     end
   end