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
This commit is contained in:
parent
fef7894c1b
commit
0c54b2a6a3
@ -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)
|
||||
|
@ -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'):
|
||||
|
Loading…
x
Reference in New Issue
Block a user