From 677de074c71355ea0ce47884bdbc1d9cb320b13f Mon Sep 17 00:00:00 2001 From: Nicolas Arenas Date: Tue, 1 Oct 2024 11:17:01 +0200 Subject: [PATCH] Update vagrant and Jenkins for new installer --- tests/API-dhcp/Jenkinsfile | 2 +- tests/API-dhcp/Vagrantfile | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/API-dhcp/Jenkinsfile b/tests/API-dhcp/Jenkinsfile index 8038f19..cd29f85 100644 --- a/tests/API-dhcp/Jenkinsfile +++ b/tests/API-dhcp/Jenkinsfile @@ -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/" ''' } } diff --git a/tests/API-dhcp/Vagrantfile b/tests/API-dhcp/Vagrantfile index abacd4f..4f42981 100644 --- a/tests/API-dhcp/Vagrantfile +++ b/tests/API-dhcp/Vagrantfile @@ -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|