Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/310277
Change subject: New release 2.5.0-8-gcbc7f62-wmf3precise1 ...................................................................... New release 2.5.0-8-gcbc7f62-wmf3precise1 Fix shebang of several scripts to point to the virtualenv. Refresh 0002-Replace-python-shebang-with-python2.7.patch Bug: T103529 Change-Id: I7c836fc873592cfb050bfdc433dcba1668008dd0 --- M debian/changelog M debian/patches/0001-Ensure-the-repository-configuration-lock-is-released.patch M debian/patches/0002-Replace-python-shebang-with-python2.7.patch M debian/patches/0012-WMF-reduce-Gerrit-replication-delay-from-300-to-15-s.patch 4 files changed, 67 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul refs/changes/77/310277/1 diff --git a/debian/changelog b/debian/changelog index 9ce65a3..14b3572 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +zuul (2.5.0-8-gcbc7f62-wmf3precise1) precise-wikimedia; urgency=medium + + * Fix shebang of several scripts to point to the virtualenv. + Refresh 0002-Replace-python-shebang-with-python2.7.patch + Related to T103529 + + -- Antoine Musso <[email protected]> Tue, 13 Sep 2016 13:09:23 +0200 + zuul (2.5.0-8-gcbc7f62-wmf2precise1) precise-wikimedia; urgency=medium * Package tools/zuul-clear-refs.py and install it as diff --git a/debian/patches/0001-Ensure-the-repository-configuration-lock-is-released.patch b/debian/patches/0001-Ensure-the-repository-configuration-lock-is-released.patch index ff09636..cf21a8b 100644 --- a/debian/patches/0001-Ensure-the-repository-configuration-lock-is-released.patch +++ b/debian/patches/0001-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 94933de..d7867af 100644 +index 0c9f168..139a60a 100644 --- a/zuul/merger/merger.py +++ b/zuul/merger/merger.py @@ -70,7 +70,18 @@ class Repo(object): diff --git a/debian/patches/0002-Replace-python-shebang-with-python2.7.patch b/debian/patches/0002-Replace-python-shebang-with-python2.7.patch index afd209b..85adbe6 100644 --- a/debian/patches/0002-Replace-python-shebang-with-python2.7.patch +++ b/debian/patches/0002-Replace-python-shebang-with-python2.7.patch @@ -9,7 +9,10 @@ --- setup.py | 2 +- tests/base.py | 2 +- + tests/cmd/test_cloner.py | 2 +- tests/test_cloner.py | 2 +- + tests/test_daemon.py | 2 +- + tests/test_gerrit.py | 2 +- tests/test_layoutvalidator.py | 2 +- tests/test_merger_repo.py | 2 +- tests/test_requirements.py | 2 +- @@ -18,12 +21,14 @@ tests/test_zuultrigger.py | 2 +- tools/trigger-job.py | 2 +- tools/zuul-changes.py | 2 +- + tools/zuul-clear-refs.py | 2 +- zuul/cmd/__init__.py | 2 +- zuul/cmd/client.py | 2 +- zuul/cmd/cloner.py | 2 +- + zuul/cmd/launcher.py | 2 +- zuul/cmd/merger.py | 2 +- zuul/cmd/server.py | 2 +- - 16 files changed, 16 insertions(+), 16 deletions(-) + 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/setup.py b/setup.py index 70c2b3f..4ec20a6 100644 @@ -45,6 +50,16 @@ # Copyright 2012 Hewlett-Packard Development Company, L.P. # +diff --git a/tests/cmd/test_cloner.py b/tests/cmd/test_cloner.py +index 9cbb5b8..d9fda11 100644 +--- a/tests/cmd/test_cloner.py ++++ b/tests/cmd/test_cloner.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2.7 + + # Licensed under the Apache License, Version 2.0 (the "License"); you may + # not use this file except in compliance with the License. You may obtain diff --git a/tests/test_cloner.py b/tests/test_cloner.py index e3576bd..064a61c 100644 --- a/tests/test_cloner.py @@ -55,6 +70,26 @@ # Copyright 2012 Hewlett-Packard Development Company, L.P. # Copyright 2014 Wikimedia Foundation Inc. +diff --git a/tests/test_daemon.py b/tests/test_daemon.py +index 689d4f7..14d219c 100644 +--- a/tests/test_daemon.py ++++ b/tests/test_daemon.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2.7 + + # Copyright 2014 Hewlett-Packard Development Company, L.P. + # +diff --git a/tests/test_gerrit.py b/tests/test_gerrit.py +index 93ce122..9291073 100644 +--- a/tests/test_gerrit.py ++++ b/tests/test_gerrit.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2.7 + + # Copyright 2015 BMW Car IT GmbH + # diff --git a/tests/test_layoutvalidator.py b/tests/test_layoutvalidator.py index 46a8c7c..101e0d0 100644 --- a/tests/test_layoutvalidator.py @@ -86,7 +121,7 @@ # Copyright 2012-2014 Hewlett-Packard Development Company, L.P. # diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py -index 628775d..ac70091 100755 +index 335f987..a4bca5c 100755 --- a/tests/test_scheduler.py +++ b/tests/test_scheduler.py @@ -1,4 +1,4 @@ @@ -135,6 +170,16 @@ # Copyright 2013 OpenStack Foundation # Copyright 2015 Hewlett-Packard Development Company, L.P. # +diff --git a/tools/zuul-clear-refs.py b/tools/zuul-clear-refs.py +index 60ce744..3eb08c6 100755 +--- a/tools/zuul-clear-refs.py ++++ b/tools/zuul-clear-refs.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2.7 + # Copyright 2014-2015 Antoine "hashar" Musso + # Copyright 2014-2015 Wikimedia Foundation Inc. + # diff --git a/zuul/cmd/__init__.py b/zuul/cmd/__init__.py index 5ffd431..120c62c 100644 --- a/zuul/cmd/__init__.py @@ -165,6 +210,16 @@ # # Copyright 2014 Antoine "hashar" Musso # Copyright 2014 Wikimedia Foundation Inc. +diff --git a/zuul/cmd/launcher.py b/zuul/cmd/launcher.py +index 49643ae..9efa22f 100644 +--- a/zuul/cmd/launcher.py ++++ b/zuul/cmd/launcher.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2.7 + # Copyright 2012 Hewlett-Packard Development Company, L.P. + # Copyright 2013-2014 OpenStack Foundation + # diff --git a/zuul/cmd/merger.py b/zuul/cmd/merger.py index 797a990..2807f9e 100644 --- a/zuul/cmd/merger.py diff --git a/debian/patches/0012-WMF-reduce-Gerrit-replication-delay-from-300-to-15-s.patch b/debian/patches/0012-WMF-reduce-Gerrit-replication-delay-from-300-to-15-s.patch index 438cfb2..82ba8e5 100644 --- a/debian/patches/0012-WMF-reduce-Gerrit-replication-delay-from-300-to-15-s.patch +++ b/debian/patches/0012-WMF-reduce-Gerrit-replication-delay-from-300-to-15-s.patch @@ -12,7 +12,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zuul/source/gerrit.py b/zuul/source/gerrit.py -index 73cf726..463e6fe 100644 +index 463f315..7cc0b3d 100644 --- a/zuul/source/gerrit.py +++ b/zuul/source/gerrit.py @@ -37,7 +37,7 @@ def detect_cycle(change, history=None): -- To view, visit https://gerrit.wikimedia.org/r/310277 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c836fc873592cfb050bfdc433dcba1668008dd0 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul Gerrit-Branch: debian/precise-wikimedia Gerrit-Owner: Hashar <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
