Update vagrant and Jenkins for new installer

nginx_conf
Nicolas Arenas 2024-10-01 11:17:01 +02:00 committed by Nicolas Arenas
parent 8d48007532
commit 677de074c7
2 changed files with 1 additions and 6 deletions

View File

@ -29,7 +29,7 @@ pipeline {
new_ip=$(vagrant ssh -c "hostname -I" | tr -d '\r')
echo "$QINDEL_PASS" | sudo -S bash -c "echo '$new_ip api-test' >> /etc/hosts"
echo "IP: $new_ip"
curl -L -X 'GET' -H 'accept: application/json' "http://api-test/opengnsys3/rest/dhcp/subnets/"
curl -f -L -X 'GET' -H 'accept: application/json' "http://api-test/opengnsys3/rest/dhcp/subnets/"
'''
}
}

View File

@ -7,11 +7,6 @@ SERVER_NAME=localhost
echo "Provisioning with shell script..."
cd /vagrant/installer
chmod +x ogdhcp_installer.sh && ./ogdhcp_installer.sh
cp /vagrant/tests/API-dhcp/assets/kea-ctrl-agent.conf /etc/kea/kea-ctrl-agent.conf
a2ensite ogdhcp.conf
a2dissite 000-default.conf
systemctl restart apache2
sed -i "s|{{SERVER_NAME}}|${SERVER_NAME}|g" /opt/ogdhcp/public/swagger-initializer.js
SCRIPT
Vagrant.configure('2') do |config|