Skip to content

Commit 48b3e21

Browse files
author
Christopher Thorn
committed
(maint) Fix up pre-suite for beaker tests
Solaris packing was updated that requires a newer cert in the keychain of the VMs that we use. However for the older version of Solaris the cert is not on the keychain. This PR calls a beaker-puppet script that will add the required cert to the keychain of the VM. Also follow redirects when downloading agent.
1 parent 681db67 commit 48b3e21

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

.github/workflows/unit_tests_with_nightly_puppet_gem.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
- name: Install the latest nightly build of puppet${{ matrix.puppet_version }} gem
4747
run: |
48-
curl http://nightlies.puppet.com/downloads/gems/puppet${{ matrix.puppet_version }}-nightly/${{ matrix.gem_file }} --output puppet.gem
48+
curl --location http://nightlies.puppet.com/downloads/gems/puppet${{ matrix.puppet_version }}-nightly/${{ matrix.gem_file }} --output puppet.gem
4949
gem install puppet.gem -N
5050
5151
- name: Prepare testing environment with bundler

spec/spec_helper_acceptance.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
require 'beaker-rspec'
2+
require 'beaker-puppet'
23
require 'beaker/module_install_helper'
34
require 'beaker/puppet_install_helper'
45

56
RSpec.configure do |c|
67
c.before :suite do
78
unless ENV['BEAKER_provision'] == 'no'
9+
# Until solaris gets new image we need to add to the cert chain on solaris, call a beaker-puppet setup script to handle this
10+
bp_path, _status = Open3.capture2('bundler info beaker-puppet --path')
11+
bp_path.strip!
12+
solaris_patch_path = bp_path + '/setup/common/003_solaris_cert_fix.rb'
13+
require solaris_patch_path
814
run_puppet_install_helper
915
install_module_on(hosts)
1016
install_module_dependencies_on(hosts)

0 commit comments

Comments
 (0)