Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@ jobs:
pulpcore_version:
- '3.22'
- '3.21'
- '3.18'
- '3.17'
- '3.16'
name: Acceptance / ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }} - Pulp ${{ matrix.pulpcore_version }}
steps:
- uses: actions/checkout@v2
Expand Down
12 changes: 2 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,9 @@ Default recommended version.

Supported version

### Pulpcore 3.18
### Pulpcore 3.16 - 3.18

Supported version.

### Pulpcore 3.17

Supported version.

### Pulpcore 3.16

Supported version.
Untested, but should work. Not recommended.

## Installation layout

Expand Down
17 changes: 10 additions & 7 deletions manifests/repo.pp
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,16 @@
notify => Anchor['pulpcore::repo'],
}

package { 'pulpcore-dnf-module':
ensure => $dist_tag,
name => 'pulpcore',
enable_only => true,
provider => 'dnfmodule',
require => File['/etc/yum.repos.d/pulpcore.repo'],
notify => Anchor['pulpcore::repo'],
# Only EL8 has DNF modules
if $dist_tag == 'el8' {
package { 'pulpcore-dnf-module':
ensure => $dist_tag,
name => 'pulpcore',
enable_only => true,
provider => 'dnfmodule',
require => File['/etc/yum.repos.d/pulpcore.repo'],
notify => Anchor['pulpcore::repo'],
}
}

# An anchor is used because it can be collected
Expand Down
6 changes: 4 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"8"
"8",
"9"
]
},
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"8"
"8",
"9"
]
}
],
Expand Down
20 changes: 12 additions & 8 deletions spec/classes/repo_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@
.that_notifies('Anchor[pulpcore::repo]')
end

it 'configures the pulpcore module' do
is_expected.to contain_package('pulpcore-dnf-module')
.with_name('pulpcore')
.with_ensure(/^el\d+/)
.with_enable_only(true)
.with_provider('dnfmodule')
.that_requires('File[/etc/yum.repos.d/pulpcore.repo]')
.that_notifies('Anchor[pulpcore::repo]')
if os_facts[:os]['release']['major'] == '8'
it 'configures the pulpcore module' do
is_expected.to contain_package('pulpcore-dnf-module')
.with_name('pulpcore')
.with_ensure(/^el\d+/)
.with_enable_only(true)
.with_provider('dnfmodule')
.that_requires('File[/etc/yum.repos.d/pulpcore.repo]')
.that_notifies('Anchor[pulpcore::repo]')
end
else
it { is_expected.not_to contain_package('pulpcore-dnf-module') }
end
end
end
Expand Down