From fb85471281d26ccf68cf286991bd50dab60257b5 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Tue, 21 Feb 2017 14:18:08 +0000 Subject: [PATCH] buildmaster: make sure minions are removed --- .../buildmaster-configure/templates/taskotron.master.cfg.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index 70d6a1b6bd..e8e39741fc 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -188,6 +188,10 @@ factory.addStep(ShellCommand(command=["runtask", logfiles={'taskotron.log': {'filename': '/var/log/taskotron/taskotron.log', }})) {% endif %} + +factory.addStep(ShellCommand(command=Interpolate('testcloud instance remove --force taskotron-%(prop:uuid)s; true'), + descriptionDone=['Make sure the minion is removed'])) + # create artifacts dir on master factory.addStep(MasterShellCommand(command=["mkdir", '-m', '0755', Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s')], descriptionDone=['Create artifacs dir']))