From f3b167f11d1799c559e8307d600303b37768369d Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Fri, 17 Jan 2025 09:38:36 +0100
Subject: [PATCH] Updated Vagrant

---
 vagrant/Vagrantfile-esxi | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/vagrant/Vagrantfile-esxi b/vagrant/Vagrantfile-esxi
index ffcd34e..02d9850 100644
--- a/vagrant/Vagrantfile-esxi
+++ b/vagrant/Vagrantfile-esxi
@@ -32,13 +32,18 @@ SSH_GIT_KEY_PASS = ENV['SSH_GIT_KEY_PASS'] || ''
 OGSERVERSCRIPT = <<OEOL
 export GIT_SSL_NO_VERIFY=1
 export INTERFACE="eth0"
+apt -y update 
+apt install -y git 
 EXTIP=$(ip -o -4 addr show "$INTERFACE" | awk '{print $4}' | cut -d'/' -f1)
 echo "La dirección IP de la interfaz $INTERFACE es: $EXTIP"
-export BRANCH=malaga-automated-testing
-curl -q -k https://ognproject.evlt.uma.es/gitea/api/v1/repos/opengnsys/oginstaller/raw/python-installer/opengnsys_installer.sh?ref=python-installer -o opengnsys_installer.sh
-cp /tmp/questions/config* /tmp/oginstall 
-chmod 755 /tmp/oginstall/component-installer.sh
-/tmp/oginstall/component-installer.sh
+git clone https://ognproject.evlt.uma.es/gitea/opengnsys/oginstaller.git /tmp/repo
+cd /tmp/repo 
+mkdir /tmp/oginstall
+git checkout #{BRANCH}
+cp -r python-installer/* /tmp/oginstall
+cp -r composer-installer/* /tmp/oginstall
+chmod 755 /tmp/oginstall/*.sh
+chmod 755 /tmp/oginstall/*.py
 
 OEOL
 
@@ -58,8 +63,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end 
     config.vm.box = "esxi_clone/dummy"
     config.vm.hostname = "og-#{BRANCH_EXTRA}"
-    config.vm.provision "file" , source: "config/config*", destination: "/tmp/questions/"
-    config.vm.provision "shell", inline: OGSERVERSCRIPT
-
+    config.vm.provision "shell", inline: OGSERVERSCRIPT    config.vm.provision "file", source: "config/", destination: "/tmp/oginstall/"
+    config.vm.provision = "shell", inline: "/tmp/oginstall/coponent-installer.sh" 
 end