diff --git a/debian/changelog b/debian/changelog index cd20245..7a05012 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ patroni (2.1.6-1) UNRELEASED; urgency=medium [ Michael Banck ] * debian/patches/acceptance_tests_system_patroni.patch: Refreshed. + * debian/patches/acceptance_tests_reenable_etcdv2.patch: New patch, + re-enables V2 API on etcd-3.4 and later. -- Debian PostgreSQL Maintainers Mon, 02 Jan 2023 09:21:16 +0100 diff --git a/debian/patches/acceptance_tests_reenable_etcdv2.patch b/debian/patches/acceptance_tests_reenable_etcdv2.patch new file mode 100644 index 0000000..809e31d --- /dev/null +++ b/debian/patches/acceptance_tests_reenable_etcdv2.patch @@ -0,0 +1,11 @@ +--- ./features/environment.py.orig 2023-01-02 12:29:07.053058799 +0100 ++++ ./features/environment.py 2023-01-02 12:30:04.865314768 +0100 +@@ -441,7 +441,7 @@ + self._client_cls = client_cls + + def _start(self): +- return subprocess.Popen(["etcd", "--data-dir", self._work_directory], ++ return subprocess.Popen(["etcd", "--enable-v2", "--data-dir", self._work_directory], + stdout=self._log, stderr=subprocess.STDOUT) + + def _is_running(self): diff --git a/debian/patches/series b/debian/patches/series index 2262e21..287de71 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ requirements_setuptools.patch offline_intersphinx.patch requirements_cdiff.patch avoid_overwriting_configuration_during_boostrap.patch +acceptance_tests_reenable_etcdv2.patch