From f9733b647d7a3c8355b1566f372eb40b0e74e5c0 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 20 May 2013 15:58:27 -0700 Subject: [PATCH] Always update Jenkins node label before deletion. * modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml: Run the devstack-vm-inprogress.py script before the devstack-vm-delete.py script to ensure the Jenkins slave node label is updated before we delete the node on the cloud provider end. Change-Id: I1c9bd3ff369b4e595a041ccc687db060a11691e5 Reviewed-on: https://review.openstack.org/29844 Reviewed-by: James E. Blair Reviewed-by: Jeremy Stanley Approved: Jeremy Stanley Tested-by: Jenkins --- .../files/jenkins_job_builder/config/devstack-gate.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index 870132461c..03f540fca9 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -573,6 +573,9 @@ export STATSD_HOST="graphite.openstack.org" export STATSD_PORT=8125 export PYTHONUNBUFFERED=true + set +e + $WORKSPACE/devstack-gate/devstack-vm-inprogress.py $DEVSTACK_NODE_NAME + set -e $WORKSPACE/devstack-gate/devstack-vm-delete.py $DEVSTACK_NODE_NAME