From 863ed82b2a2b53207bb22a87f46398dc2835e726 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 23 Nov 2020 14:48:42 +0000 Subject: [PATCH] steps/runconfig: Attempt a different way to terminate the build It seems the previous approach was confusing buildbot about the task status so try and be more specific and use better APIs to avoid this. Signed-off-by: Richard Purdie --- steps/runconfig.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/steps/runconfig.py b/steps/runconfig.py index db9130b..aa7b858 100644 --- a/steps/runconfig.py +++ b/steps/runconfig.py @@ -210,8 +210,8 @@ class TargetPresent(shell.ShellCommand): # If the command fails, fall back to old style run-config execution rc = super().evaluateCommand(cmd) if rc != SUCCESS: - self.finished(SKIPPED) - self.build.results = SKIPPED self.descriptionDone = "Target not present in branch configuration" - self.build.buildFinished(["Target not present in branch configuration"], SKIPPED) + # Run no further steps, terminate the build + self.build.terminate = True + return SKIPPED return SUCCESS