aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/unit_tests_with_nightly_puppet_gem.yaml2
-rw-r--r--spec/spec_helper_acceptance.rb6
2 files changed, 7 insertions, 1 deletions
diff --git a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml
index 2ea5e91..85c367b 100644
--- a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml
+++ b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml
@@ -45,7 +45,7 @@ jobs:
- name: Install the latest nightly build of puppet${{ matrix.puppet_version }} gem
run: |
- curl http://nightlies.puppet.com/downloads/gems/puppet${{ matrix.puppet_version }}-nightly/${{ matrix.gem_file }} --output puppet.gem
+ curl --location http://nightlies.puppet.com/downloads/gems/puppet${{ matrix.puppet_version }}-nightly/${{ matrix.gem_file }} --output puppet.gem
gem install puppet.gem -N
- name: Prepare testing environment with bundler
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index a6836f2..6654675 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,10 +1,16 @@
require 'beaker-rspec'
+require 'beaker-puppet'
require 'beaker/module_install_helper'
require 'beaker/puppet_install_helper'
RSpec.configure do |c|
c.before :suite do
unless ENV['BEAKER_provision'] == 'no'
+ # Until solaris gets new image we need to add to the cert chain on solaris, call a beaker-puppet setup script to handle this
+ bp_path, _status = Open3.capture2('bundler info beaker-puppet --path')
+ bp_path.strip!
+ solaris_patch_path = bp_path + '/setup/common/003_solaris_cert_fix.rb'
+ require solaris_patch_path
run_puppet_install_helper
install_module_on(hosts)
install_module_dependencies_on(hosts)