diff --git a/Jenkinsfile b/Jenkinsfile index b5bf236..e9eb093 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,26 +29,31 @@ 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 - - """ +""" } } } diff --git a/vagrant/Vagrantfile-esxi b/vagrant/Vagrantfile-esxi index b8addbe..637171a 100644 --- a/vagrant/Vagrantfile-esxi +++ b/vagrant/Vagrantfile-esxi @@ -29,6 +29,15 @@ GITEA_TOKEN = ENV['GITEA_TOKEN'] GITEA_USER = ENV['GITEA_USER'] || 'unizar' SSH_GIT_KEY_PASS = ENV['SSH_GIT_KEY_PASS'] || '' +OGSERVERSCRIPT = <