From 183cdb9b9a19d66150ccc47b225c660b062d4db9 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 5 Mar 2019 14:50:38 -0800 Subject: [PATCH] Update git submodules * Update puppet-project_config from branch 'master' - Check if project_config_ref is defined before using it This checks if the $::project_config_ref fact is defined before accessing it. Puppet 4 seems to care about his more than puppet 3 so we are only just notcing this now. Note that this fix relies on puppet boolean operator 'and' short circuiting which I'm not entirely sure if it does yet. Change-Id: I2b89ac146609f9c3b22c05814b85c646f74b393a - 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: Iaf82b5b89b4b01b811189f7a4c451ddfca8a80ad --- puppet-project_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppet-project_config b/puppet-project_config index 8310d56085..41a3cc927d 160000 --- a/puppet-project_config +++ b/puppet-project_config @@ -1 +1 @@ -Subproject commit 8310d56085732ddfbaa43442b6c2ba2061d9d1f4 +Subproject commit 41a3cc927de32e099fcc3e00f7879749297f1be3