From 90dbfdd1c8f6d43b1a4cd1633482b49f2a7f2f1e Mon Sep 17 00:00:00 2001 From: Zuul Date: Mon, 4 Feb 2019 16:39:20 +0000 Subject: [PATCH] Update git submodules * Update puppet-subunit2sql from branch 'master' - Merge "Add beaker tests" - Merge "Fix subunit2sql install guard for idempotency" - Add beaker tests Add tests to ensure the subunit2sql server and worker classes work and that the worker service can start. Change-Id: I842ecbcd5988484043643fdae1c49dd95bba90f2 - Update Gemfile for Zuulv3 The logic in the Gemfile was relying on Zuulv2 variables to find out whether the spec helper gem was already available on disk, and since Zuulv3 has changed things it was failing to find it and downloading the master version instead. This patch ensures the Gemfile looks for the gem in the right place when running in CI. Change-Id: I363a112ee856a9f5eb986fd878730db082c26a81 - Fix subunit2sql install guard for idempotency The exec to install subunit2sql tries to compare the output of pip list versus pip search to determine whether it is on the latest version. Without this patch, the pip list command produces a string that has too many spaces on the end and therefore doesn't match the result of the pip search command. This means that it will always try to reinstall subunit2sql even when it doesn't need to, which breaks idempotency tests. This patch fixes the regex group to exclude trailing spaces. Change-Id: I92f614db2da936d68d8f2305b348c65ba773b01c - Pin statsd to version 2.1.2 The os-performance-tools library currently caps its statsd dependency at <3.0[1]. If we try to install latest, puppet will succeed at installing it in the first place, but upon the next run it will see that it is not using the latest and try to upgrade and fail due to the cap. Add the pin so that it doesn't try and fail to install something it can't. [1] http://git.openstack.org/cgit/openstack/os-performance-tools/tree/requirements.txt?id=d96d5145fa5facdfd7a4e5ea2811948f0efd465e#n7 Change-Id: I37303d3b23cf5c387511292a8e128faa1f9df9ae - Don't install python-yaml package PyYAML is already a dependency of subunit2sql, so the distro package doesn't need to be installed explicitly. If it is installed by the distro, then on a system with pip 10 the subunit2sql installation will fail. Change-Id: Ie7be5cf01fcf9a630c7bf282549a862515c159d9 --- puppet-subunit2sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppet-subunit2sql b/puppet-subunit2sql index bb2f9fc027..11005605dc 160000 --- a/puppet-subunit2sql +++ b/puppet-subunit2sql @@ -1 +1 @@ -Subproject commit bb2f9fc027bfc5ae09aa861b005c707e6681e960 +Subproject commit 11005605dc87458a9c53278e55fde9b869bc05e8