From e6d48fd0521cc39fa9af077ad316e2cc42807f90 Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Fri, 11 Jul 2025 12:52:16 -0400 Subject: [PATCH] Update acceptance to validate 3.1.x and 4.0.x upgrades --- spec/acceptance/openondemand_spec.rb | 27 +++++++++++++++------------ spec/spec_helper_acceptance_setup.rb | 5 ++++- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/spec/acceptance/openondemand_spec.rb b/spec/acceptance/openondemand_spec.rb index 84eafbe..208c362 100644 --- a/spec/acceptance/openondemand_spec.rb +++ b/spec/acceptance/openondemand_spec.rb @@ -3,18 +3,21 @@ require 'spec_helper_acceptance' describe 'openondemand class:' do - supported_releases.each do |release| - context "when repo_release => 'staging/#{release}'" do - it 'runs successfully' do - pp = <<-PP - class { 'openondemand': - repo_release => 'staging/#{release}', - generator_insecure => true, - } - PP - - apply_manifest(pp, catch_failures: true) - apply_manifest(pp, catch_changes: true) + supported_releases.each_pair do |release, versions| + versions.each do |version| + context "when repo_release => 'staging/#{release}' ondemand_package_ensure => '#{version}'" do + it 'runs successfully' do + pp = <<-PP + class { 'openondemand': + repo_release => 'staging/#{release}', + ondemand_package_ensure => '#{version}', + generator_insecure => true, + } + PP + + apply_manifest(pp, catch_failures: true) + apply_manifest(pp, catch_changes: true) + end end end end diff --git a/spec/spec_helper_acceptance_setup.rb b/spec/spec_helper_acceptance_setup.rb index ca41c43..a18dd0b 100644 --- a/spec/spec_helper_acceptance_setup.rb +++ b/spec/spec_helper_acceptance_setup.rb @@ -5,7 +5,10 @@ on hosts, 'puppet config set strict warning' def supported_releases - ['3.1', '4.0'] + { + '3.1' => ['3.1.13', 'latest'], + '4.0' => ['4.0.5', 'latest'], + } end RSpec.configure do |c|