Hashar has submitted this change and it was merged.
Change subject: Bump upstream 5984adc..3ebedde
......................................................................
Bump upstream 5984adc..3ebedde
That updates Zuul to the commit just before cross repo dependencies.
Change python-daemon dependency to >= 2.0.4
$ git shortlog --no-merges 5984adc..3ebedde
Antoine Musso (1):
Support stack on Geard embedded server
David Pursehouse (1):
Require python-daemon version at least 2.0.4
James E. Blair (3):
Add daemon test
Cloner: handle missing ZUUL_BRANCH/_REF
Make needs_change plural
Jan Kundrát (2):
Validate top level of the layout configuration, too
Fix passing labels to Gerrit when they are not defined in
All-Projects
Joshua Hesketh (3):
Pin python-daemon<2.0
Fix pep8 issues
Fix up status page dependencies
Jukka Lehtniemi (1):
Scheduler: Reduce log level for non-configured projects
Spencer Krum (1):
Update example gerrit messages for new syntax
Change-Id: I581ebd49c822cfba15f7d477c8b9c5d01296018f
---
M debian/changelog
M debian/patches/0001-wmf-soften-requirements.patch
M debian/patches/0002-Merger-ensure_cloned-now-looks-for-.git.patch
M debian/patches/0003-Update-merge-status-after-merge-merge-is-submitted.patch
M debian/patches/0004-Ensure-the-repository-configuration-lock-is-released.patch
M debian/patches/0005-Replace-python-shebang-with-python2.7.patch
M debian/patches/0006-Cloner-Implement-cache-no-hardlinks-argument.patch
7 files changed, 25 insertions(+), 17 deletions(-)
Approvals:
Hashar: Verified; Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
index 1640c6e..6cbbe0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+zuul (2.0.0-327-g3ebedde-wmf1precise1) precise-wikimedia; urgency=low
+
+ * Bump upstream 5984adc..3ebedde
+ * python-daemon to >= 2.0.4
+
+ -- Antoine Musso <has...@free.fr> Tue, 21 Jul 2015 16:29:03 +0200
+
+
zuul (2.0.0-306-g5984adc-wmf1precise1) precise-wikimedia; urgency=low
* Bump GitPython from 0.3.2.RC1 to 0.3.2.1. Fetched by dh_virtualenv.
diff --git a/debian/patches/0001-wmf-soften-requirements.patch
b/debian/patches/0001-wmf-soften-requirements.patch
index d0d0832..b535b04 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 4c85447..9c6ae3e 100644
+index b24d171..60be50b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,11 +3,10 @@ pbr>=0.5.21,<1.0
@@ -28,6 +28,6 @@
GitPython>=0.3.2.1
lockfile>=0.8
-ordereddict
- python-daemon
+ python-daemon>=2.0.4
extras
statsd>=1.0.0,<3.0
diff --git a/debian/patches/0002-Merger-ensure_cloned-now-looks-for-.git.patch
b/debian/patches/0002-Merger-ensure_cloned-now-looks-for-.git.patch
index 96e72aa..4ec79fa 100644
--- a/debian/patches/0002-Merger-ensure_cloned-now-looks-for-.git.patch
+++ b/debian/patches/0002-Merger-ensure_cloned-now-looks-for-.git.patch
@@ -131,7 +131,7 @@
+ sub_repo.createRepoObject().remotes[0].url,
+ message="Sub repository points to upstream project2")
diff --git a/zuul/merger/merger.py b/zuul/merger/merger.py
-index 922c67e..25955f8 100644
+index 8774f10..f36b974 100644
--- a/zuul/merger/merger.py
+++ b/zuul/merger/merger.py
@@ -40,7 +40,7 @@ class Repo(object):
diff --git
a/debian/patches/0003-Update-merge-status-after-merge-merge-is-submitted.patch
b/debian/patches/0003-Update-merge-status-after-merge-merge-is-submitted.patch
index 8f7188d..9edbe63 100644
---
a/debian/patches/0003-Update-merge-status-after-merge-merge-is-submitted.patch
+++
b/debian/patches/0003-Update-merge-status-after-merge-merge-is-submitted.patch
@@ -28,7 +28,7 @@
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
-index a7548c1..e3c98ed 100755
+index 89056f4..43a5e79 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -23,9 +23,11 @@ import time
@@ -80,10 +80,10 @@
"Test each of the statsd methods used in the scheduler"
import extras
diff --git a/zuul/scheduler.py b/zuul/scheduler.py
-index def7429..9941053 100644
+index 1a9e714..74b6b6e 100644
--- a/zuul/scheduler.py
+++ b/zuul/scheduler.py
-@@ -1212,7 +1212,6 @@ class BasePipelineManager(object):
+@@ -1220,7 +1220,6 @@ class BasePipelineManager(object):
return True
if build_set.merge_state == build_set.PENDING:
return False
@@ -91,7 +91,7 @@
ref = build_set.ref
if hasattr(item.change, 'refspec') and not ref:
self.log.debug("Preparing ref for: %s" % item.change)
-@@ -1230,6 +1229,7 @@ class BasePipelineManager(object):
+@@ -1238,6 +1237,7 @@ class BasePipelineManager(object):
self.sched.merger.updateRepo(item.change.project.name,
url, build_set,
self.pipeline.precedence)
diff --git
a/debian/patches/0004-Ensure-the-repository-configuration-lock-is-released.patch
b/debian/patches/0004-Ensure-the-repository-configuration-lock-is-released.patch
index 719453f..10f116f 100644
---
a/debian/patches/0004-Ensure-the-repository-configuration-lock-is-released.patch
+++
b/debian/patches/0004-Ensure-the-repository-configuration-lock-is-released.patch
@@ -24,7 +24,7 @@
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/zuul/merger/merger.py b/zuul/merger/merger.py
-index 25955f8..7aa6d6e 100644
+index f36b974..c286375 100644
--- a/zuul/merger/merger.py
+++ b/zuul/merger/merger.py
@@ -55,7 +55,18 @@ class Repo(object):
diff --git a/debian/patches/0005-Replace-python-shebang-with-python2.7.patch
b/debian/patches/0005-Replace-python-shebang-with-python2.7.patch
index 89a2066..5fb43d4 100644
--- a/debian/patches/0005-Replace-python-shebang-with-python2.7.patch
+++ b/debian/patches/0005-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 1cafc46..0047e77 100755
+index b872a85..28d6b76 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -1,4 +1,4 @@
@@ -46,7 +46,7 @@
# Copyright 2012 Hewlett-Packard Development Company, L.P.
#
diff --git a/tests/test_cloner.py b/tests/test_cloner.py
-index ab2683d..b0e2784 100644
+index 137c157..1ce4a0a 100644
--- a/tests/test_cloner.py
+++ b/tests/test_cloner.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 e3c98ed..82312f8 100755
+index 43a5e79..1335ad1 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -1,4 +1,4 @@
@@ -106,7 +106,7 @@
# Copyright 2014 Hewlett-Packard Development Company, L.P.
# Copyright 2014 Rackspace Australia
diff --git a/tests/test_zuultrigger.py b/tests/test_zuultrigger.py
-index 9a90a98..22d8076 100644
+index 3f339be..35a1ea2 100644
--- a/tests/test_zuultrigger.py
+++ b/tests/test_zuultrigger.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 8922161..d94df97 100755
+index d0bb966..551cb5e 100755
--- a/zuul/cmd/cloner.py
+++ b/zuul/cmd/cloner.py
@@ -1,4 +1,4 @@
@@ -176,7 +176,7 @@
# Copyright 2013-2014 OpenStack Foundation
#
diff --git a/zuul/cmd/server.py b/zuul/cmd/server.py
-index 25dab6f..db27b18 100755
+index 832eae4..6a245fe 100755
--- a/zuul/cmd/server.py
+++ b/zuul/cmd/server.py
@@ -1,4 +1,4 @@
diff --git
a/debian/patches/0006-Cloner-Implement-cache-no-hardlinks-argument.patch
b/debian/patches/0006-Cloner-Implement-cache-no-hardlinks-argument.patch
index 565463f..89ffbfd 100644
--- a/debian/patches/0006-Cloner-Implement-cache-no-hardlinks-argument.patch
+++ b/debian/patches/0006-Cloner-Implement-cache-no-hardlinks-argument.patch
@@ -32,7 +32,7 @@
+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 d94df97..e783f5e 100755
+index 551cb5e..b507b4f 100755
--- a/zuul/cmd/cloner.py
+++ b/zuul/cmd/cloner.py
@@ -58,6 +58,9 @@ class Cloner(zuul.cmd.ZuulApp):
@@ -54,7 +54,7 @@
cloner.execute()
diff --git a/zuul/lib/cloner.py b/zuul/lib/cloner.py
-index 89ebada..c8a170c 100644
+index 2b35e41..df87243 100644
--- a/zuul/lib/cloner.py
+++ b/zuul/lib/cloner.py
@@ -29,7 +29,8 @@ class Cloner(object):
@@ -74,7 +74,7 @@
+ self.cache_no_hardlinks = cache_no_hardlinks
self.projects = projects
self.workspace = workspace
- self.zuul_branch = zuul_branch
+ self.zuul_branch = zuul_branch or ''
@@ -73,8 +75,11 @@ class Cloner(object):
if (self.cache_dir and
os.path.exists(git_cache) and
--
To view, visit https://gerrit.wikimedia.org/r/226081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I581ebd49c822cfba15f7d477c8b9c5d01296018f
Gerrit-PatchSet: 2
Gerrit-Project: integration/zuul
Gerrit-Branch: debian/precise-wikimedia
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
