Showing with 27 additions and 10 deletions.
  1. +10 −0 CHANGELOG.md
  2. +2 −2 Gemfile
  3. +1 −1 manifests/rake.pp
  4. +8 −1 metadata.json
  5. +1 −1 spec/defines/foreman_plugin_spec.rb
  6. +4 −4 spec/defines/foreman_rake_spec.rb
  7. +1 −1 spec/support/acceptance/purge.rb
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Changelog

## [25.1.0](https://github.com/theforeman/puppet-foreman/tree/25.1.0) (2024-08-12)

[Full Changelog](https://github.com/theforeman/puppet-foreman/compare/25.0.0...25.1.0)

**Implemented enhancements:**

- always log foreman-rake output [\#1170](https://github.com/theforeman/puppet-foreman/pull/1170) ([evgeni](https://github.com/evgeni))
- Update puppet\_metadata to ~\> 4.0 and voxpupuli-acceptance to ~\> 3.0 [\#1169](https://github.com/theforeman/puppet-foreman/pull/1169) ([archanaserver](https://github.com/archanaserver))
- Add AlmaLinux 8 & 9 support [\#1168](https://github.com/theforeman/puppet-foreman/pull/1168) ([archanaserver](https://github.com/archanaserver))

## [25.0.0](https://github.com/theforeman/puppet-foreman/tree/25.0.0) (2024-05-16)

[Full Changelog](https://github.com/theforeman/puppet-foreman/compare/24.2.0...25.0.0)
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ gem 'kafo_module_lint', {"groups"=>["test"]}
gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 1.0', {"groups"=>["test"]}
gem 'voxpupuli-test', '~> 7.0', {"groups"=>["test"]}
gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
gem 'puppet_metadata', '~> 3.3'
gem 'puppet_metadata', '~> 4.0'
gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
gem 'voxpupuli-acceptance', '~> 2.0', {"groups"=>["system_tests"]}
gem 'voxpupuli-acceptance', '~> 3.0', {"groups"=>["system_tests"]}
gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}
gem 'webmock', '~> 2.0'
gem 'oauth'
Expand Down
2 changes: 1 addition & 1 deletion manifests/rake.pp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
command => "/usr/sbin/foreman-rake ${title}",
user => $user,
environment => sort(join_keys_to_values({ 'HOME' => $app_root } + $environment, '=')),
logoutput => 'on_failure',
logoutput => true,
refreshonly => $unless =~ Undef,
timeout => $timeout,
unless => $unless,
Expand Down
9 changes: 8 additions & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{

Check warning on line 1 in metadata.json

View workflow job for this annotation

GitHub Actions / Puppet / Static validations

Skipping EOL operating system CentOS 8
"name": "theforeman-foreman",
"version": "25.0.0",
"version": "25.1.0",
"author": "theforeman",
"summary": "Foreman server configuration",
"license": "GPL-3.0+",
Expand Down Expand Up @@ -79,6 +79,13 @@
"20.04",
"22.04"
]
},
{
"operatingsystem": "AlmaLinux",
"operatingsystemrelease": [
"8",
"9"
]
}
]
}
2 changes: 1 addition & 1 deletion spec/defines/foreman_plugin_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
context 'no parameters' do
package_name = case facts[:osfamily]
when 'RedHat'
facts[:os]['release']['major'] == '7' ? 'tfm-rubygem-foreman_myplugin' : 'rubygem-foreman_myplugin'
'rubygem-foreman_myplugin'
when 'Debian'
'ruby-foreman-myplugin'
end
Expand Down
8 changes: 4 additions & 4 deletions spec/defines/foreman_rake_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
.with_command('/usr/sbin/foreman-rake db:migrate')
.with_user('foreman')
.with_environment(['HOME=/usr/share/foreman'])
.with_logoutput('on_failure')
.with_logoutput(true)
.with_refreshonly(true)
.with_timeout(nil)
.with_unless(nil)
Expand All @@ -37,7 +37,7 @@
.with_command('/usr/sbin/foreman-rake db:migrate')
.with_user('foreman')
.with_environment(['HOME=/usr/share/foreman', 'SEED_USER=admin'])
.with_logoutput('on_failure')
.with_logoutput(true)
.with_refreshonly(true)
end
end
Expand All @@ -51,7 +51,7 @@
.with_user('foreman')
.with_environment(['HOME=/usr/share/foreman'])
.with_timeout(60)
.with_logoutput('on_failure')
.with_logoutput(true)
.with_refreshonly(true)
end
end
Expand All @@ -64,7 +64,7 @@
.with_command('/usr/sbin/foreman-rake db:migrate')
.with_user('foreman')
.with_environment(['HOME=/usr/share/foreman'])
.with_logoutput('on_failure')
.with_logoutput(true)
.with_refreshonly(false)
.with_unless('/usr/bin/true')
end
Expand Down
2 changes: 1 addition & 1 deletion spec/support/acceptance/purge.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
def purge_foreman
case fact('osfamily')
when 'RedHat'
on default, 'yum -y remove foreman* tfm-*'
on default, 'yum -y remove foreman*'
when 'Debian'
on default, 'apt-get purge -y foreman*', { :acceptable_exit_codes => [0, 100] }
on default, 'apt-get purge -y ruby-hammer-cli-*', { :acceptable_exit_codes => [0, 100] }
Expand Down