From 0c54b2a6a3dae759513c81bd1862b9010377e820 Mon Sep 17 00:00:00 2001 From: Joshua Hesketh Date: Mon, 11 Apr 2016 21:23:33 +1000 Subject: [PATCH] Use the new launch client in zuul server Also rename the launcher modules to be consistent with how the merger modules are named (and reduce redundancy). Change-Id: I9a347966b0fe7c6aa41047e58c45ba5809868520 --- tests/base.py | 8 ++++---- zuul/cmd/server.py | 6 +++--- zuul/launcher/{launchclient.py => client.py} | 0 zuul/launcher/{ansiblelaunchserver.py => server.py} | 0 4 files changed, 7 insertions(+), 7 deletions(-) rename zuul/launcher/{launchclient.py => client.py} (100%) rename zuul/launcher/{ansiblelaunchserver.py => server.py} (100%) diff --git a/tests/base.py b/tests/base.py index 2f77102940..d888904511 100755 --- a/tests/base.py +++ b/tests/base.py @@ -48,8 +48,8 @@ import zuul.connection.smtp import zuul.scheduler import zuul.webapp import zuul.rpclistener -import zuul.launcher.ansiblelaunchserver -import zuul.launcher.launchclient +import zuul.launcher.server +import zuul.launcher.client import zuul.lib.swift import zuul.lib.connections import zuul.merger.client @@ -637,7 +637,7 @@ class FakeBuild(threading.Thread): self.worker.lock.release() -class RecordingLaunchServer(zuul.launcher.ansiblelaunchserver.LaunchServer): +class RecordingLaunchServer(zuul.launcher.server.LaunchServer): def __init__(self, *args, **kw): super(RecordingLaunchServer, self).__init__(*args, **kw) self.job_history = [] @@ -974,7 +974,7 @@ class ZuulTestCase(BaseTestCase): old_urlopen = urllib2.urlopen urllib2.urlopen = URLOpenerFactory - self.launcher = zuul.launcher.launchclient.LaunchClient( + self.launcher = zuul.launcher.client.LaunchClient( self.config, self.sched, self.swift) self.merge_client = zuul.merger.client.MergeClient( self.config, self.sched) diff --git a/zuul/cmd/server.py b/zuul/cmd/server.py index 2aca4f2c02..aef9500412 100755 --- a/zuul/cmd/server.py +++ b/zuul/cmd/server.py @@ -148,7 +148,7 @@ class Server(zuul.cmd.ZuulApp): def main(self): # See comment at top of file about zuul imports import zuul.scheduler - import zuul.launcher.gearman + import zuul.launcher.client import zuul.merger.client import zuul.lib.swift import zuul.webapp @@ -166,8 +166,8 @@ class Server(zuul.cmd.ZuulApp): # TODO(jhesketh): Move swift into a connection? self.swift = zuul.lib.swift.Swift(self.config) - gearman = zuul.launcher.gearman.Gearman(self.config, self.sched, - self.swift) + gearman = zuul.launcher.client.LaunchClient(self.config, self.sched, + self.swift) merger = zuul.merger.client.MergeClient(self.config, self.sched) if self.config.has_option('zuul', 'status_expiry'): diff --git a/zuul/launcher/launchclient.py b/zuul/launcher/client.py similarity index 100% rename from zuul/launcher/launchclient.py rename to zuul/launcher/client.py diff --git a/zuul/launcher/ansiblelaunchserver.py b/zuul/launcher/server.py similarity index 100% rename from zuul/launcher/ansiblelaunchserver.py rename to zuul/launcher/server.py