Morph build 11ac5b237b3640718da94ad8e252d330

System branch: master

1 files changed, 13 insertions, 16 deletions

diff --git a/distbuild/worker_build_scheduler.py b/distbuild/worker_build_scheduler.py
index d00b0290..e58059b2 100644
--- a/distbuild/worker_build_scheduler.py
+++ b/distbuild/worker_build_scheduler.py
@@ -270,13 +270,13 @@ class WorkerBuildQueuer(distbuild.StateMachine):
                 logging.debug('Worker build step already started: %s' %
                     event.artifact.basename())
                 progress = WorkerBuildStepAlreadyStarted(event.initiator_id,
-                    event.artifact.cache_key, job.who.name())
+                    event.artifact.source.cache_key, job.who.name())
             else:
                 logging.debug('Job created but not building yet '
                     '(waiting for a worker to become available): %s' %
                     event.artifact.basename())
                 progress = WorkerBuildWaiting(event.initiator_id,
-                    event.artifact.cache_key)
+                    event.artifact.source.cache_key)
 
             self.mainloop.queue_event(WorkerConnection, progress)
         else:
@@ -287,7 +287,7 @@ class WorkerBuildQueuer(distbuild.StateMachine):
                 self._give_job(job)
             else:
                 progress = WorkerBuildWaiting(event.initiator_id,
-                    event.artifact.cache_key)
+                    event.artifact.source.cache_key)
                 self.mainloop.queue_event(WorkerConnection, progress)
 
     def _handle_cancel(self, event_source, event):
@@ -506,13 +506,10 @@ class WorkerConnection(distbuild.StateMachine):
             '--build-log-on-stdout',
             job.artifact.name,
         ]
-
         msg = distbuild.message('exec-request',
             id=job.id,
             argv=argv,
-            stdin_contents=distbuild.serialise_artifact(job.artifact,
-                                                        job.artifact.repo,
-                                                        job.artifact.ref),
+            stdin_contents=distbuild.serialise_artifact(job.artifact),
         )
         self._jm.send(msg)
 
@@ -521,7 +518,7 @@ class WorkerConnection(distbuild.StateMachine):
                 % (self._worker_name, msg))
 
         started = WorkerBuildStepStarted(job.initiators,
-            job.artifact.cache_key, self.name())
+            job.artifact.source.cache_key, self.name())
 
         self.mainloop.queue_event(WorkerConnection, _JobStarted(job))
         self.mainloop.queue_event(WorkerConnection, started)
@@ -557,7 +554,7 @@ class WorkerConnection(distbuild.StateMachine):
         logging.debug('WC: emitting: %s', repr(new))
         self.mainloop.queue_event(
             WorkerConnection,
-            WorkerBuildOutput(new, job.artifact.cache_key))
+            WorkerBuildOutput(new, job.artifact.source.cache_key))
 
     def _handle_exec_response(self, msg, job):
         '''Handle completion of a job that the worker is or was running.'''
@@ -570,7 +567,7 @@ class WorkerConnection(distbuild.StateMachine):
 
         if new['exit'] != 0:
             # Build failed.
-            new_event = WorkerBuildFailed(new, job.artifact.cache_key)
+            new_event = WorkerBuildFailed(new, job.artifact.source.cache_key)
             self.mainloop.queue_event(WorkerConnection, new_event)
             self.mainloop.queue_event(WorkerConnection, _JobFailed(job))
             self.mainloop.queue_event(self, _BuildFailed())
@@ -596,10 +593,10 @@ class WorkerConnection(distbuild.StateMachine):
         logging.debug('Requesting shared artifact cache to get artifacts')
 
         job = self._current_job
-        kind = job.artifact.kind
+        kind = job.artifact.source.morphology['kind']
 
         if kind == 'chunk':
-            source_artifacts = job.artifact.source_artifacts
+            source_artifacts = job.artifact.source.artifacts
 
             suffixes = ['%s.%s' % (kind, name) for name in source_artifacts]
             suffixes.append('build-log')
@@ -620,7 +617,7 @@ class WorkerConnection(distbuild.StateMachine):
             '/1.0/fetch?host=%s:%d&cacheid=%s&artifacts=%s' %
                 (urllib.quote(worker_host),
                  self._worker_cache_server_port,
-                 urllib.quote(job.artifact.cache_key),
+                 urllib.quote(job.artifact.source.cache_key),
                  suffixes))
 
         msg = distbuild.message(
@@ -631,7 +628,7 @@ class WorkerConnection(distbuild.StateMachine):
         self.mainloop.queue_event(distbuild.HelperRouter, req)
         
         progress = WorkerBuildCaching(job.initiators,
-            job.artifact.cache_key)
+            job.artifact.source.cache_key)
         self.mainloop.queue_event(WorkerConnection, progress)
 
     def _maybe_handle_helper_result(self, event_source, event):
@@ -644,7 +641,7 @@ class WorkerConnection(distbuild.StateMachine):
 
                 new_event = WorkerBuildFinished(
                     self._current_job_exec_response,
-                    self._current_job.artifact.cache_key)
+                    self._current_job.artifact.source.cache_key)
                 self.mainloop.queue_event(WorkerConnection, new_event)
                 self.mainloop.queue_event(self, _Cached())
             else:
@@ -663,7 +660,7 @@ class WorkerConnection(distbuild.StateMachine):
 
                 new_event = WorkerBuildFailed(
                     self._current_job_exec_response,
-                    self._current_job.artifact.cache_key)
+                    self._current_job.artifact.source.cache_key)
                 self.mainloop.queue_event(WorkerConnection, new_event)
 
                 self.mainloop.queue_event(self, _BuildFailed())