offline the slave after it's been set up

RHOSINFRA-2945
rhos-infra · Jan 30, 2020 · 97dc702 · 97dc702
1 parent 3b790e6
commit 97dc702
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/devnest/lib/jenkins.py b/devnest/lib/jenkins.py
@@ -186,19 +186,16 @@ def create_update_node_from_xml(self, xml_path, directory=False):
                                                                % baseurl,
                                                                data=config_str)
 
-                LOG.info("Take the slave offline after it's been set up")
-                self.jenkins.requester.post_and_confirm_status("%s/doDisconnect"
-                                                               % baseurl, data={'offlineMessage': offlineMessage})
-
             except JenkinsAPIException:
                 LOG.debug('Node %s not found, adding new' % slave_name)
                 self.jenkins.create_node(slave_name, labels='devnest_creating_a_new_slave')
                 self.jenkins.requester.post_and_confirm_status("%s/config.xml"
                                                                % baseurl,
                                                                data=config_str)
 
+            finally:
                 LOG.info("Take the slave offline after it's been set up")
-                self.jenkins.requester.post_and_confirm_status("%s/doDisconnect"
+                self.jenkins.requester.post_and_confirm_status("%s/toggleOffline"
                                                                % baseurl, data={'offlineMessage': offlineMessage})
 
             LOG.info('Node %s updated' % slave_name)