From 5ef69b02fb5a8f8aa5cb1e414d1af8e9c78710d1 Mon Sep 17 00:00:00 2001 From: Lubos Kocman Date: Fri, 22 Jul 2016 19:18:21 +0200 Subject: [PATCH] pre-install macros in buildroot --- rida/scheduler/handlers/modules.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rida/scheduler/handlers/modules.py b/rida/scheduler/handlers/modules.py index 8e7a6aa3..246aead5 100644 --- a/rida/scheduler/handlers/modules.py +++ b/rida/scheduler/handlers/modules.py @@ -52,7 +52,6 @@ def wait(config, session, msg): module_info = build.json() if module_info['state'] != rida.BUILD_STATES["wait"]: # XXX: not sure why did we get here from state == 2 (building) FIXTHIS - print("Invalid state %s for wait()" % module_info['state']) log.error("Invalid state %s for wait(). Msg=%s" % (module_info['state'], msg)) return log.info("Found module_info=%s from message" % module_info) @@ -81,9 +80,10 @@ def wait(config, session, msg): # TODO -- this has to go eventually.. otherwise, we can only build one # module at a time and that just won't scale. builder.wait_task(task_id) + # TODO -- do cleanup if this fails artifact = get_artifact_from_srpm(srpm) - builder.buildroot_add_artifacts([artifact,]) # pretty much srpm filename + builder.buildroot_add_artifacts([artifact,], install=True) # tag && add to srpm-build group builder.buildroot_ready(artifacts=[artifact,]) build.transition(config, state="build") # Wait for the buildroot to be ready.