From 790462e96771ae63fc1e6d4becb3e359a59d5d82 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Wed, 16 Sep 2020 12:45:14 +0200 Subject: [PATCH] plugin/builder: sync status enum with upstream Align our status enums with the one from upstream, i.e. composer's koji API openAPI spec as of commit 8ccbde8. --- plugins/builder/osbuild.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/plugins/builder/osbuild.py b/plugins/builder/osbuild.py index 84e3333..09b20a1 100644 --- a/plugins/builder/osbuild.py +++ b/plugins/builder/osbuild.py @@ -122,23 +122,17 @@ class ComposeRequest: class ImageStatus(enum.Enum): SUCCESS = "success" - FAILED = "failed" + FAILURE = "failure" PENDING = "pending" BUILDING = "building" UPLOADING = "uploading" - WAITING = "waiting" - FINISHED = "finished" - RUNNING = "running" class ComposeStatus: SUCCESS = "success" - FAILED = "failed" + FAILURE = "failure" PENDING = "pending" - RUNNING = "running" - WAITING = "waiting" REGISTERING = "registering" - FINISHED = "finished" def __init__(self, status: str, images: List, koji_task_id: str): self.status = status @@ -156,11 +150,11 @@ class ComposeStatus: def is_finished(self): if self.is_success: return True - return self.status in [self.FAILED] + return self.status in [self.FAILURE] @property def is_success(self): - return self.status in [self.SUCCESS, self.FINISHED] + return self.status in [self.SUCCESS] class Client: