From 09cfc3d2a6736b15ae0d408582900683f46d7f7c Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 23 Apr 2019 15:22:43 +0200
Subject: [PATCH] Block hashdiff 0.3.9 and bundler 2.0

The 0.3.9 hashdiff package breaks beaker-trusty, use 0.3.8 for now.

Cap bundler since version 2.0.1 needs Ruby >= 2.3.0.

Change-Id: I464e29fca3958d058dc5ede93a486fd5c79eb29a
---
 puppet-openstack_infra_spec_helper.gemspec | 6 ++++++
 run_unit_tests.sh                          | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/puppet-openstack_infra_spec_helper.gemspec b/puppet-openstack_infra_spec_helper.gemspec
index 59de796..3161454 100644
--- a/puppet-openstack_infra_spec_helper.gemspec
+++ b/puppet-openstack_infra_spec_helper.gemspec
@@ -62,6 +62,12 @@ Gem::Specification.new do |spec|
   # While we're investigating it, let's pin Beaker to 2.x releases.
   spec.add_dependency 'beaker', ['< 3.0.0']
 
+  # hashdiff 0.3.9 breaks beaker-trusty job
+  spec.add_dependency 'hashdiff', ['< 0.3.9']
+
+  # bundler 2.0 needs Ruby >= 2.3.0
+  spec.add_dependency 'bundler', ['< 2.0.0']
+
   # dependencies that are needed to run beaker-rspec
   spec.add_dependency 'beaker-rspec'
   spec.add_dependency 'beaker-puppet_install_helper'
diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index d804d74..4bcfc17 100755
--- a/run_unit_tests.sh
+++ b/run_unit_tests.sh
@@ -38,6 +38,6 @@ cd opendev/puppet-openstackci
 sed -i "s/:git => 'https:\/\/opendev.org\/opendev\/puppet-openstack_infra_spec_helper'}/:path => '..\/..'}/" Gemfile
 
 # Install dependencies
-gem install bundler --no-rdoc --no-ri --verbose
+gem install bundler --version '< 2.0.0' --no-rdoc --no-ri --verbose
 
 $GEM_HOME/bin/bundle install