Jenkinsfile

@@ -29,31 +29,26 @@ pipeline {
             steps {
                 script {
                 sh """
-echo "BRANCH: ${BRANCH}"
-echo "EXTRA_NAME: ${EXTRA_NAME}"
-echo "NUMBER_OF_CLIENTS: ${NUMBER_OF_CLIENTS}"
-echo "DEFAULT_UDS_REST_URL: ${DEFAULT_UDS_REST_URL}"
-echo "DEFAULT_UDS_AUTHENTICATOR: ${DEFAULT_UDS_AUTHENTICATOR}"
-echo "DEFAULT_OGLIVE: ${DEFAULT_OGLIVE}"
-echo "UDS_CREDENTIALS: ${UDS_CREDENTIALS}"
-echo "VI_USERNAME: ${VI_USERNAME}"
-echo "VI_PASSWORD: ${VI_PASSWORD}"
-echo "GITEA_USER: ${GITEA_USER}"
-echo "GITEA_TOKEN: ${GITEA_TOKEN}"
-echo "VAGRANT_FILE: ${VAGRANT_FILE}"
-echo "ESXI_PASSWORD: ${ESXI_PASSWORD}"
-chmod 755 vagrant/provision_esxi_net.sh
-cat vagrant/provision_esxi_net.sh
-echo "vagrant/provision_esxi_net.sh executed"
-cp $USER_SSK_PRIVATE_KEY installer/vagrant/config/id_rsa
-BRANCH_EXTRA=$BRANCH
-EXTRA_NAME=${EXTRA_NAME// /}
-[[ -n $EXTRA_NAME ]] && BRANCH_EXTRA=$BRANCH-$EXTRA_NAME
-export BRANCH_EXTRA
-echo ========================= Setting up an ESXi network
-installer/vagrant/provision_esxi_net.sh $BRANCH_EXTRA
 
-"""
+                    echo "BRANCH: ${BRANCH}"
+                    echo "EXTRA_NAME: ${EXTRA_NAME}"
+                    echo "NUMBER_OF_CLIENTS: ${NUMBER_OF_CLIENTS}"
+                    echo "DEFAULT_UDS_REST_URL: ${DEFAULT_UDS_REST_URL}"
+                    echo "DEFAULT_UDS_AUTHENTICATOR: ${DEFAULT_UDS_AUTHENTICATOR}"
+                    echo "DEFAULT_OGLIVE: ${DEFAULT_OGLIVE}"
+                    echo "UDS_CREDENTIALS: ${UDS_CREDENTIALS}"
+                    echo "VI_USERNAME: ${VI_USERNAME}"
+                    echo "VI_PASSWORD: ${VI_PASSWORD}"
+                    echo "GITEA_USER: ${GITEA_USER}"
+                    echo "GITEA_TOKEN: ${GITEA_TOKEN}"
+                    echo "VAGRANT_FILE: ${VAGRANT_FILE}"
+                    echo "ESXI_PASSWORD: ${ESXI_PASSWORD}"
+                    chmod 755 vagrant/provision_esxi_net.sh
+                    cat vagrant/provision_esxi_net.sh
+                    echo "vagrant/provision_esxi_net.sh executed"
+                    cp $USER_SSK_PRIVATE_KEY installer/vagrant/config/id_rsa
+
+                """
                 }
             }
         }

vagrant/Vagrantfile-esxi

@@ -29,15 +29,6 @@ GITEA_TOKEN = ENV['GITEA_TOKEN']
 GITEA_USER = ENV['GITEA_USER'] || 'unizar'
 SSH_GIT_KEY_PASS = ENV['SSH_GIT_KEY_PASS'] || ''
 
-OGSERVERSCRIPT = <<OEOL
-export GIT_SSL_NO_VERIFY=1
-INTERFACE="eth0"
-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
-chmod 755 opengnsys_installer.sh 
-OEOL
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.provider :vmware_esxi do |esxi|
@@ -55,6 +46,4 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end 
     config.vm.box = "esxi_clone/dummy"
     config.vm.hostname = "og-#{BRANCH_EXTRA}"
-    config.vm.provision "shell", inline: OGSERVERSCRIPT
 end 
-

vagrant/config/config_ogBoot.json

@@ -1 +0,0 @@
-{"release": "opengnsys_devel-0.0.21", "ogCore_ServerIP": "192.168.2.1", "ogBoot_ServerIP": "192.168.2.1", "ogBoot_Dir": "/opt/opengnsys/ogboot", "ogLive_Default": "https://ognproject.evlt.uma.es/oglive/ogLive-noble-6.8.0-31-generic-amd64-r20241128.62778c9_20241129.iso", "ogBootSambaUser": "opengnsys", "ogBootSambaPass": "og", "confirm_ogBootSambaPass": "og"}

vagrant/config/config_ogCore.json

@@ -1 +0,0 @@
-{"release": "opengnsys_devel-0.0.21", "username": "ogadmin", "password": "12345678", "confirm_password": "12345678"}

vagrant/config/config_ogDhcp.json

@@ -1 +0,0 @@
-{"release": "opengnsys_devel-0.0.21", "ogbootIP": "192.168.2.1", "ogDhcpIP": "192.168.2.1", "ogDhcp_Dir": "/opt/opengnsys/ogdhcp", "interfaces": ["eth1"]}

vagrant/config/config_ogGui.json

@@ -1 +0,0 @@
-{"release": "opengnsys_devel-0.0.21", "ogcore_ip": "https://127.0.0.1:8443"}

vagrant/config/config_ogRepository.json

@@ -1 +0,0 @@
-{"release": "opengnsys_devel-0.0.21", "ogrepository_ip": "192.168.2.1", "ogcore_server_ip": "192.168.2.1", "ogrepository_samba_user": "opengnsys", "ogrepository_samba_pass": "og", "confirm_repository_password": "og"}