diff --git a/etc/zuul.conf-sample b/etc/zuul.conf-sample index 0ae42a2bf3..6e79f9b73d 100644 --- a/etc/zuul.conf-sample +++ b/etc/zuul.conf-sample @@ -23,7 +23,6 @@ state_dir=/var/lib/zuul git_dir=/var/lib/zuul/git ;git_user_email=zuul@example.com ;git_user_name=zuul -zuul_url=http://zuul.example.com/p [executor] default_username=zuul diff --git a/tests/fixtures/zuul-connections-gerrit-and-github.conf b/tests/fixtures/zuul-connections-gerrit-and-github.conf index 04f2cc2064..49e53c72fc 100644 --- a/tests/fixtures/zuul-connections-gerrit-and-github.conf +++ b/tests/fixtures/zuul-connections-gerrit-and-github.conf @@ -8,7 +8,6 @@ tenant_config=config/multi-driver/main.yaml git_dir=/tmp/zuul-test/git git_user_email=zuul@example.com git_user_name=zuul -zuul_url=http://zuul.example.com/p [executor] git_dir=/tmp/zuul-test/executor-git diff --git a/tests/fixtures/zuul-connections-merger.conf b/tests/fixtures/zuul-connections-merger.conf index df465d541d..771fc5057d 100644 --- a/tests/fixtures/zuul-connections-merger.conf +++ b/tests/fixtures/zuul-connections-merger.conf @@ -8,7 +8,6 @@ status_url=http://zuul.example.com/status git_dir=/tmp/zuul-test/git git_user_email=zuul@example.com git_user_name=zuul -zuul_url=http://zuul.example.com/p [executor] git_dir=/tmp/zuul-test/executor-git diff --git a/tests/fixtures/zuul-connections-multiple-gerrits.conf b/tests/fixtures/zuul-connections-multiple-gerrits.conf index 66a6926320..c6eb39e926 100644 --- a/tests/fixtures/zuul-connections-multiple-gerrits.conf +++ b/tests/fixtures/zuul-connections-multiple-gerrits.conf @@ -8,7 +8,6 @@ tenant_config=main.yaml git_dir=/tmp/zuul-test/merger-git git_user_email=zuul@example.com git_user_name=zuul -zuul_url=http://zuul.example.com/p [executor] git_dir=/tmp/zuul-test/executor-git diff --git a/tests/fixtures/zuul-connections-same-gerrit.conf b/tests/fixtures/zuul-connections-same-gerrit.conf index 3262294fc8..a4f558d0fe 100644 --- a/tests/fixtures/zuul-connections-same-gerrit.conf +++ b/tests/fixtures/zuul-connections-same-gerrit.conf @@ -8,7 +8,6 @@ tenant_config=config/zuul-connections-same-gerrit/main.yaml git_dir=/tmp/zuul-test/merger-git git_user_email=zuul@example.com git_user_name=zuul -zuul_url=http://zuul.example.com/p [executor] git_dir=/tmp/zuul-test/executor-git diff --git a/tests/fixtures/zuul-disk-accounting.conf b/tests/fixtures/zuul-disk-accounting.conf index b0ae48e52c..6f02fa42fa 100644 --- a/tests/fixtures/zuul-disk-accounting.conf +++ b/tests/fixtures/zuul-disk-accounting.conf @@ -8,7 +8,6 @@ tenant_config=main.yaml git_dir=/tmp/zuul-test/merger-git git_user_email=zuul@example.com git_user_name=zuul -zuul_url=http://zuul.example.com/p [executor] git_dir=/tmp/zuul-test/executor-git diff --git a/tests/fixtures/zuul-git-driver.conf b/tests/fixtures/zuul-git-driver.conf index 4321871755..b24b0a1b44 100644 --- a/tests/fixtures/zuul-git-driver.conf +++ b/tests/fixtures/zuul-git-driver.conf @@ -8,7 +8,6 @@ tenant_config=config/zuul-connections-same-gerrit/main.yaml git_dir=/tmp/zuul-test/git git_user_email=zuul@example.com git_user_name=zuul -zuul_url=http://zuul.example.com/p [executor] git_dir=/tmp/zuul-test/executor-git diff --git a/tests/fixtures/zuul-github-driver.conf b/tests/fixtures/zuul-github-driver.conf index 732c30a047..a96bde2ee2 100644 --- a/tests/fixtures/zuul-github-driver.conf +++ b/tests/fixtures/zuul-github-driver.conf @@ -8,7 +8,6 @@ status_url=http://zuul.example.com/status/#{change.number},{change.patchset} git_dir=/tmp/zuul-test/git git_user_email=zuul@example.com git_user_name=zuul -zuul_url=http://zuul.example.com/p [executor] git_dir=/tmp/zuul-test/executor-git diff --git a/tests/fixtures/zuul-push-reqs.conf b/tests/fixtures/zuul-push-reqs.conf index cb699e0089..2217f94a06 100644 --- a/tests/fixtures/zuul-push-reqs.conf +++ b/tests/fixtures/zuul-push-reqs.conf @@ -8,7 +8,6 @@ status_url=http://zuul.example.com/status git_dir=/tmp/zuul-test/git git_user_email=zuul@example.com git_user_name=zuul -zuul_url=http://zuul.example.com/p [executor] git_dir=/tmp/zuul-test/executor-git diff --git a/tests/fixtures/zuul-sql-driver-bad.conf b/tests/fixtures/zuul-sql-driver-bad.conf index 1f1b75f126..e2a9438664 100644 --- a/tests/fixtures/zuul-sql-driver-bad.conf +++ b/tests/fixtures/zuul-sql-driver-bad.conf @@ -8,7 +8,6 @@ layout_config=layout-connections-multiple-voters.yaml git_dir=/tmp/zuul-test/merger-git git_user_email=zuul@example.com git_user_name=zuul -zuul_url=http://zuul.example.com/p [executor] git_dir=/tmp/zuul-test/executor-git diff --git a/tests/fixtures/zuul-sql-driver.conf b/tests/fixtures/zuul-sql-driver.conf index 688d65bcce..e0ff3d5002 100644 --- a/tests/fixtures/zuul-sql-driver.conf +++ b/tests/fixtures/zuul-sql-driver.conf @@ -8,7 +8,6 @@ tenant_config=main.yaml git_dir=/tmp/zuul-test/merger-git git_user_email=zuul@example.com git_user_name=zuul -zuul_url=http://zuul.example.com/p [executor] git_dir=/tmp/zuul-test/executor-git diff --git a/tests/fixtures/zuul.conf b/tests/fixtures/zuul.conf index d6de76c547..7bc8c59af8 100644 --- a/tests/fixtures/zuul.conf +++ b/tests/fixtures/zuul.conf @@ -8,7 +8,6 @@ tenant_config=main.yaml git_dir=/tmp/zuul-test/merger-git git_user_email=zuul@example.com git_user_name=zuul -zuul_url=http://zuul.example.com/p [executor] git_dir=/tmp/zuul-test/executor-git diff --git a/zuul/executor/server.py b/zuul/executor/server.py index 21c4cf1482..22ca59ff91 100644 --- a/zuul/executor/server.py +++ b/zuul/executor/server.py @@ -507,7 +507,6 @@ class ExecutorServer(object): # perhaps hostname+pid. self.hostname = socket.gethostname() self.log_streaming_port = log_streaming_port - self.zuul_url = config.get('merger', 'zuul_url') self.merger_lock = threading.Lock() self.verbose = False self.command_map = dict( @@ -798,8 +797,7 @@ class ExecutorServer(object): args['branch'], args['files'], args.get('dirs', [])) result = dict(updated=True, - files=files, - zuul_url=self.zuul_url) + files=files) job.sendWorkComplete(json.dumps(result)) def merge(self, job): @@ -808,8 +806,7 @@ class ExecutorServer(object): ret = self.merger.mergeChanges(args['items'], args.get('files'), args.get('dirs', []), args.get('repo_state')) - result = dict(merged=(ret is not None), - zuul_url=self.zuul_url) + result = dict(merged=(ret is not None)) if ret is None: result['commit'] = result['files'] = result['repo_state'] = None else: diff --git a/zuul/manager/__init__.py b/zuul/manager/__init__.py index 09b09d7e2f..dfb3238a2b 100644 --- a/zuul/manager/__init__.py +++ b/zuul/manager/__init__.py @@ -675,7 +675,6 @@ class PipelineManager(object): build_set = event.build_set item = build_set.item build_set.merge_state = build_set.COMPLETE - build_set.zuul_url = event.zuul_url if event.merged: build_set.commit = event.commit build_set.files.setFiles(event.files) diff --git a/zuul/merger/client.py b/zuul/merger/client.py index e354d5dd18..dd9c8d5518 100644 --- a/zuul/merger/client.py +++ b/zuul/merger/client.py @@ -128,7 +128,6 @@ class MergeClient(object): def onBuildCompleted(self, job): data = getJobData(job) - zuul_url = data.get('zuul_url') merged = data.get('merged', False) updated = data.get('updated', False) commit = data.get('commit') @@ -140,7 +139,7 @@ class MergeClient(object): (job, merged, updated, commit)) job.setComplete() if job.build_set: - self.sched.onMergeCompleted(job.build_set, zuul_url, + self.sched.onMergeCompleted(job.build_set, merged, updated, commit, files, repo_state) # The test suite expects the job to be removed from the diff --git a/zuul/merger/server.py b/zuul/merger/server.py index 555a4bca06..c342e1ac83 100644 --- a/zuul/merger/server.py +++ b/zuul/merger/server.py @@ -28,7 +28,6 @@ class MergeServer(object): def __init__(self, config, connections={}): self.config = config - self.zuul_url = config.get('merger', 'zuul_url') merge_root = get_default(self.config, 'merger', 'git_dir', '/var/lib/zuul/merger-git') @@ -97,8 +96,7 @@ class MergeServer(object): ret = self.merger.mergeChanges( args['items'], args.get('files'), args.get('dirs'), args.get('repo_state')) - result = dict(merged=(ret is not None), - zuul_url=self.zuul_url) + result = dict(merged=(ret is not None)) if ret is None: result['commit'] = result['files'] = result['repo_state'] = None else: @@ -113,6 +111,5 @@ class MergeServer(object): args['branch'], args['files'], args.get('dirs')) result = dict(updated=True, - files=files, - zuul_url=self.zuul_url) + files=files) job.sendWorkComplete(json.dumps(result)) diff --git a/zuul/model.py b/zuul/model.py index 90cc81d4f3..6538905d47 100644 --- a/zuul/model.py +++ b/zuul/model.py @@ -1237,7 +1237,6 @@ class BuildSet(object): self.previous_build_set = None self.uuid = None self.commit = None - self.zuul_url = None self.dependent_items = None self.merger_items = None self.unable_to_merge = False diff --git a/zuul/scheduler.py b/zuul/scheduler.py index 0a33b00a26..a64d9e0b6c 100644 --- a/zuul/scheduler.py +++ b/zuul/scheduler.py @@ -136,17 +136,15 @@ class MergeCompletedEvent(ResultEvent): """A remote merge operation has completed :arg BuildSet build_set: The build_set which is ready. - :arg str zuul_url: The URL of the Zuul Merger. :arg bool merged: Whether the merge succeeded (changes with refs). :arg bool updated: Whether the repo was updated (changes without refs). :arg str commit: The SHA of the merged commit (changes with refs). :arg dict repo_state: The starting repo state before the merge. """ - def __init__(self, build_set, zuul_url, merged, updated, commit, + def __init__(self, build_set, merged, updated, commit, files, repo_state): self.build_set = build_set - self.zuul_url = zuul_url self.merged = merged self.updated = updated self.commit = commit @@ -317,11 +315,11 @@ class Scheduler(threading.Thread): self.wake_event.set() self.log.debug("Done adding complete event for build: %s" % build) - def onMergeCompleted(self, build_set, zuul_url, merged, updated, + def onMergeCompleted(self, build_set, merged, updated, commit, files, repo_state): self.log.debug("Adding merge complete event for build set: %s" % build_set) - event = MergeCompletedEvent(build_set, zuul_url, merged, + event = MergeCompletedEvent(build_set, merged, updated, commit, files, repo_state) self.result_event_queue.put(event) self.wake_event.set()