Update git submodules
* Update puppet-gerrit from branch 'master' - Add support for specifying which refs to replicate Sometimes one would like to only replicate a subset of the refs in a git repo, such as not replicating refs/changes. Change-Id: Ibf6c02d59c6901f82be6a96b676b1bd28c4b61f7 - Merge "Allow lists of trackingid footers" - Merge "Fix beaker tests" - Fix beaker tests On puppet 4, the tests were failing because the new ordering algorithm caused the gerrit initializer exec resource to happen before the database was set up. This patch adds an explicit ordering to the gerrit::mysql class in the test fixtures to ensure the database is set up first. This shouldn't be an issue in real life because we don't use puppet to set up the database. Also override the vhost_name and canonical server name parameters with 'localhost' since the $fqdn fact on test nodes can be wonky without some extra setup. Also add a conditional to the ssl-cert group exec so that it doesn't run every time. Unfortunately this is not enough to make the tests idempotent since the tidy resource behaves strangely when the directory contains a symlink. Change-Id: I56174d98496cd640b5b6490650a643c1aed740f7 - 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: I66ee4529d821acd41663a83fc371d36de0333fcd - Allow lists of trackingid footers Gerrit allows for multiple footers in a single trackingid. If a footers list is provided, iterate through all its entries; if not though, we should continue supporting the old footer string as a fallback. Change-Id: I99e16246e81b7ebc50e96054a2e3790aed0089bc
This commit is contained in:
parent
d8df4a8d33
commit
bdd6faa005
@ -1 +1 @@
|
||||
Subproject commit ed2a3a85ae5a1d8fd3e838fd340f9c9a1f302c70
|
||||
Subproject commit 8cfffc49bc309084b91d02f1ff548e6784c02e9b
|
Loading…
Reference in New Issue
Block a user