Hashar has submitted this change and it was merged. Change subject: 2.1.0-95-g66c8e52-wmf1precise1 ......................................................................
2.1.0-95-g66c8e52-wmf1precise1 Change-Id: Id9da77d06b59216aedcef0aa7963e23061051d51 --- M debian/changelog M debian/patches/0001-wmf-soften-requirements.patch M debian/patches/0002-Update-merge-status-after-merge-merge-is-submitted.patch M debian/patches/0003-Ensure-the-repository-configuration-lock-is-released.patch M debian/patches/0004-Replace-python-shebang-with-python2.7.patch M debian/patches/0005-Cloner-Implement-cache-no-hardlinks-argument.patch M debian/patches/0006-Revert-Fix-passing-labels-to-Gerrit-when-they-are-no.patch M debian/patches/0007-zuul-cloner-recognizes-bare-repos-in-cache-dir.patch D debian/patches/0008-wmf-pin-python-daemon-2.1.0.patch M debian/patches/series 10 files changed, 37 insertions(+), 59 deletions(-) Approvals: Paladox: Looks good to me, but someone else must approve Hashar: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 02097fb..5d1d856 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +zuul (2.1.0-95-g66c8e52-wmf1precise1) precise-wikimedia; urgency=medium + + * Slowly catch up with upstream + * 0008-wmf-pin-python-daemon-2.1.0 is no more needed. + + -- Antoine <[email protected]> Mon, 30 May 2016 13:55:52 +0200 + zuul (2.1.0-60-g1cc37f7-wmf4precise1) precise-wikimedia; urgency=critical * 0008-wmf-pin-python-daemon-2.1.0.patch diff --git a/debian/patches/0001-wmf-soften-requirements.patch b/debian/patches/0001-wmf-soften-requirements.patch index cdbc47c..fbea119 100644 --- a/debian/patches/0001-wmf-soften-requirements.patch +++ b/debian/patches/0001-wmf-soften-requirements.patch @@ -14,7 +14,7 @@ 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt -index c682999..e82ad04 100644 +index 6318a59..e4e083c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,10 +3,9 @@ pbr>=0.5.21,<1.0 @@ -27,6 +27,6 @@ +paramiko GitPython>=0.3.3 -ordereddict - python-daemon>=2.0.4 + python-daemon>=2.0.4,<2.1.0 extras statsd>=1.0.0,<3.0 diff --git a/debian/patches/0002-Update-merge-status-after-merge-merge-is-submitted.patch b/debian/patches/0002-Update-merge-status-after-merge-merge-is-submitted.patch index 360acb1..82e08a5 100644 --- a/debian/patches/0002-Update-merge-status-after-merge-merge-is-submitted.patch +++ b/debian/patches/0002-Update-merge-status-after-merge-merge-is-submitted.patch @@ -28,10 +28,10 @@ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py -index 4955de6..0c34684 100755 +index a257440..52ef91a 100755 --- a/tests/test_scheduler.py +++ b/tests/test_scheduler.py -@@ -24,10 +24,12 @@ +@@ -24,10 +24,12 @@ import urllib import urllib2 import yaml @@ -44,7 +44,7 @@ import zuul.scheduler import zuul.rpcclient import zuul.reporter.gerrit -@@ -2003,6 +2005,35 @@ def test_rerun_on_error(self): +@@ -2051,6 +2053,35 @@ class TestScheduler(ZuulTestCase): self.assertEqual(self.countJobResults(self.history, 'RUN_ERROR'), 1) self.assertEqual(self.countJobResults(self.history, 'SUCCESS'), 3) @@ -81,10 +81,10 @@ "Test each of the statsd methods used in the scheduler" import extras diff --git a/zuul/scheduler.py b/zuul/scheduler.py -index a9bd6b2..b6883e2 100644 +index 2355801..ead1229 100644 --- a/zuul/scheduler.py +++ b/zuul/scheduler.py -@@ -1305,7 +1305,6 @@ def prepareRef(self, item): +@@ -1343,7 +1343,6 @@ class BasePipelineManager(object): return True if build_set.merge_state == build_set.PENDING: return False @@ -92,7 +92,7 @@ ref = build_set.ref if hasattr(item.change, 'refspec') and not ref: self.log.debug("Preparing ref for: %s" % item.change) -@@ -1323,6 +1322,7 @@ def prepareRef(self, item): +@@ -1361,6 +1360,7 @@ class BasePipelineManager(object): self.sched.merger.updateRepo(item.change.project.name, url, build_set, self.pipeline.precedence) diff --git a/debian/patches/0003-Ensure-the-repository-configuration-lock-is-released.patch b/debian/patches/0003-Ensure-the-repository-configuration-lock-is-released.patch index 0ecc1ea..dda1b79 100644 --- a/debian/patches/0003-Ensure-the-repository-configuration-lock-is-released.patch +++ b/debian/patches/0003-Ensure-the-repository-configuration-lock-is-released.patch @@ -27,7 +27,7 @@ index 1e881bf..61a4719 100644 --- a/zuul/merger/merger.py +++ b/zuul/merger/merger.py -@@ -70,7 +70,18 @@ def _ensure_cloned(self): +@@ -70,7 +70,18 @@ class Repo(object): if self.username: repo.config_writer().set_value('user', 'name', self.username) diff --git a/debian/patches/0004-Replace-python-shebang-with-python2.7.patch b/debian/patches/0004-Replace-python-shebang-with-python2.7.patch index fe3e00f..d86dec9 100644 --- a/debian/patches/0004-Replace-python-shebang-with-python2.7.patch +++ b/debian/patches/0004-Replace-python-shebang-with-python2.7.patch @@ -36,7 +36,7 @@ # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/base.py b/tests/base.py -index 5ddb160..8bb0f01 100755 +index 57b30b5..acf03b9 100755 --- a/tests/base.py +++ b/tests/base.py @@ -1,4 +1,4 @@ @@ -76,7 +76,7 @@ # Copyright 2012 Hewlett-Packard Development Company, L.P. # Copyright 2014 Wikimedia Foundation Inc. diff --git a/tests/test_requirements.py b/tests/test_requirements.py -index 4316925..85751ce 100644 +index 3ae56ad..202010c 100644 --- a/tests/test_requirements.py +++ b/tests/test_requirements.py @@ -1,4 +1,4 @@ @@ -86,7 +86,7 @@ # Copyright 2012-2014 Hewlett-Packard Development Company, L.P. # diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py -index 0c34684..3b755b7 100755 +index 52ef91a..407387a 100755 --- a/tests/test_scheduler.py +++ b/tests/test_scheduler.py @@ -1,4 +1,4 @@ @@ -146,7 +146,7 @@ # Copyright 2013 OpenStack Foundation # diff --git a/zuul/cmd/client.py b/zuul/cmd/client.py -index 6e14ff5..0948147 100644 +index 59ac419..e31f467 100644 --- a/zuul/cmd/client.py +++ b/zuul/cmd/client.py @@ -1,4 +1,4 @@ @@ -156,7 +156,7 @@ # Copyright 2013 OpenStack Foundation # diff --git a/zuul/cmd/cloner.py b/zuul/cmd/cloner.py -index e4a0e7b..09bda3e 100755 +index c616aa1..a922a34 100755 --- a/zuul/cmd/cloner.py +++ b/zuul/cmd/cloner.py @@ -1,4 +1,4 @@ diff --git a/debian/patches/0005-Cloner-Implement-cache-no-hardlinks-argument.patch b/debian/patches/0005-Cloner-Implement-cache-no-hardlinks-argument.patch index a27e4c0..83fe8fe 100644 --- a/debian/patches/0005-Cloner-Implement-cache-no-hardlinks-argument.patch +++ b/debian/patches/0005-Cloner-Implement-cache-no-hardlinks-argument.patch @@ -19,25 +19,25 @@ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/doc/source/cloner.rst b/doc/source/cloner.rst -index 2ddf0b5..60c8764 100644 +index 70577cc..c0ca990 100644 --- a/doc/source/cloner.rst +++ b/doc/source/cloner.rst -@@ -87,3 +87,8 @@ cloning any projects it processes from those found in that directory. - The URL of origin remote of the resulting clone will be reset to use - the ``git_base_url`` and then the remote will be updated so that the - repository has all the information in the upstream repository. +@@ -108,3 +108,8 @@ repository has all the information in the upstream repository. + The default for ``--cache-dir`` is taken from the environment variable + ``ZUUL_CACHE_DIR``. A value provided explicitly on the command line + overrides the environment variable setting. + +The ``--cache-no-hardlinks`` option can be used to force git to +always copy git objects from the cache directory. By default, if +the cache directory is on the same disk as the workspace, git-clone +will hardlink git objects to speed up the process and save space. diff --git a/zuul/cmd/cloner.py b/zuul/cmd/cloner.py -index 09bda3e..5e42e72 100755 +index a922a34..63825e4 100755 --- a/zuul/cmd/cloner.py +++ b/zuul/cmd/cloner.py -@@ -54,6 +54,10 @@ def parse_arguments(self): - help=('a directory that holds cached copies of ' - 'repos from which to make an initial clone.' +@@ -57,6 +57,10 @@ class Cloner(zuul.cmd.ZuulApp): + 'Can also be set via ZUUL_CACHE_DIR ' + 'environment variable.' )) + parser.add_argument('--cache-no-hardlinks', dest='cache_no_hardlinks', + action='store_true', @@ -46,7 +46,7 @@ parser.add_argument('git_base_url', help='reference repo to clone from') parser.add_argument('projects', nargs='+', -@@ -142,6 +146,7 @@ def main(self): +@@ -145,6 +149,7 @@ class Cloner(zuul.cmd.ZuulApp): clone_map_file=self.args.clone_map_file, project_branches=project_branches, cache_dir=self.args.cache_dir, @@ -68,7 +68,7 @@ self.clone_map = [] self.dests = None -@@ -37,6 +38,7 @@ def __init__(self, git_base_url, projects, workspace, zuul_branch, +@@ -37,6 +38,7 @@ class Cloner(object): self.branch = branch self.git_url = git_base_url self.cache_dir = cache_dir @@ -76,7 +76,7 @@ self.projects = projects self.workspace = workspace self.zuul_branch = zuul_branch or '' -@@ -73,8 +75,11 @@ def cloneUpstream(self, project, dest): +@@ -73,8 +75,11 @@ class Cloner(object): if (self.cache_dir and os.path.exists(git_cache) and not os.path.exists(dest)): diff --git a/debian/patches/0006-Revert-Fix-passing-labels-to-Gerrit-when-they-are-no.patch b/debian/patches/0006-Revert-Fix-passing-labels-to-Gerrit-when-they-are-no.patch index 46ff578..36636b5 100644 --- a/debian/patches/0006-Revert-Fix-passing-labels-to-Gerrit-when-they-are-no.patch +++ b/debian/patches/0006-Revert-Fix-passing-labels-to-Gerrit-when-they-are-no.patch @@ -23,10 +23,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zuul/lib/gerrit.py b/zuul/lib/gerrit.py -index 90faf40..f4b6d10 100644 +index 1434389..d2e155c 100644 --- a/zuul/lib/gerrit.py +++ b/zuul/lib/gerrit.py -@@ -120,7 +120,7 @@ def review(self, project, change, message, action={}): +@@ -120,7 +120,7 @@ class Gerrit(object): if v is True: cmd += ' --%s' % k else: diff --git a/debian/patches/0007-zuul-cloner-recognizes-bare-repos-in-cache-dir.patch b/debian/patches/0007-zuul-cloner-recognizes-bare-repos-in-cache-dir.patch index 7cbc38a..6fa9ded 100644 --- a/debian/patches/0007-zuul-cloner-recognizes-bare-repos-in-cache-dir.patch +++ b/debian/patches/0007-zuul-cloner-recognizes-bare-repos-in-cache-dir.patch @@ -37,7 +37,7 @@ import logging import os import shutil -@@ -118,6 +119,28 @@ def test_cache_dir(self): +@@ -118,6 +119,28 @@ class TestCloner(ZuulTestCase): self.worker.release() self.waitUntilSettled() @@ -70,7 +70,7 @@ index c404d9e..c6798a1 100644 --- a/zuul/lib/cloner.py +++ b/zuul/lib/cloner.py -@@ -71,24 +71,32 @@ def execute(self): +@@ -71,24 +71,32 @@ class Cloner(object): def cloneUpstream(self, project, dest): # Check for a cached git repo first git_cache = '%s/%s' % (self.cache_dir, project) diff --git a/debian/patches/0008-wmf-pin-python-daemon-2.1.0.patch b/debian/patches/0008-wmf-pin-python-daemon-2.1.0.patch deleted file mode 100644 index 12ce7ca..0000000 --- a/debian/patches/0008-wmf-pin-python-daemon-2.1.0.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Antoine Musso <[email protected]> -Date: Thu, 26 Nov 2015 23:17:47 +0100 -Subject: wmf: pin python-daemon <2.1.0 - -Causes Zuul scheduler to fails layout validation with: - -daemon.daemon.DaemonOSEnvironmentError: Unable to change process owner -([Errno 1] Operation not permitted) - -Bug: T119741 -Change-Id: Ia0d3a6f5979183bca76d3553f3e3b3dcf43350f2 ---- - requirements.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/requirements.txt b/requirements.txt -index e82ad04..e4e083c 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -6,7 +6,7 @@ Paste - WebOb - paramiko - GitPython>=0.3.3 --python-daemon>=2.0.4 -+python-daemon>=2.0.4,<2.1.0 - extras - statsd>=1.0.0,<3.0 - voluptuous>=0.7 diff --git a/debian/patches/series b/debian/patches/series index 8bde73d..cbded76 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,4 +5,3 @@ 0005-Cloner-Implement-cache-no-hardlinks-argument.patch 0006-Revert-Fix-passing-labels-to-Gerrit-when-they-are-no.patch 0007-zuul-cloner-recognizes-bare-repos-in-cache-dir.patch -0008-wmf-pin-python-daemon-2.1.0.patch -- To view, visit https://gerrit.wikimedia.org/r/291719 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id9da77d06b59216aedcef0aa7963e23061051d51 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul Gerrit-Branch: debian/precise-wikimedia Gerrit-Owner: Hashar <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: Paladox <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
