Skip to content

Commit

Permalink
Ensure maven:3.8 is enabled on EL8
Browse files Browse the repository at this point in the history
The maven 3.5 and 3.6 modules are no longer supported on RHEL.
  • Loading branch information
ehelms committed Jul 17, 2023
1 parent dfbeff6 commit 105f0f1
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
7 changes: 7 additions & 0 deletions manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@
}

if $enable_pki_core {
package { 'maven:3.8':
ensure => installed,
enable_only => true,
provider => 'dnfmodule',
before => Package['pki-core'],
}

package { 'pki-core':
ensure => installed,
enable_only => true,
Expand Down
8 changes: 8 additions & 0 deletions spec/acceptance/basic_candlepin_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,12 @@
it { should be_grouped_into 'tomcat' }
its(:content) { should eq("katelloUser=CN=ActiveMQ Artemis Deferred, OU=Artemis, O=ActiveMQ, L=AMQ, ST=AMQ, C=AMQ\n") }
end

describe command('dnf module list --enabled | grep -E "pki-core"') do
its(:exit_status) { should eq 0 }
end

describe command('dnf module list --enabled | grep -E "maven\s+3\.8"') do
its(:exit_status) { should eq 0 }
end
end
1 change: 1 addition & 0 deletions spec/classes/candlepin_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
it { is_expected.to contain_class('candlepin::install') }
it { is_expected.to contain_package('candlepin').with_ensure('present') }
it { is_expected.not_to contain_package('wget') }
it { is_expected.to contain_package('maven:3.8').that_comes_before('Package[pki-core]') }
it { is_expected.to contain_package('pki-core').that_comes_before('Package[candlepin]') }

# config
Expand Down

0 comments on commit 105f0f1

Please sign in to comment.