Showing with 55 additions and 37 deletions.
  1. +3 −4 .github/workflows/ci.yml
  2. +18 −0 CHANGELOG.md
  3. +2 −10 README.md
  4. +10 −7 manifests/repo.pp
  5. +10 −8 metadata.json
  6. +12 −8 spec/classes/repo_spec.rb
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
puppet_unit_test_matrix: ${{ steps.get_outputs.outputs.puppet_unit_test_matrix }}
env:
BUNDLE_WITHOUT: development:system_tests:release
PUPPET_GEM_VERSION: '~> 7.24'
steps:
- uses: actions/checkout@v2
- name: Setup ruby
Expand All @@ -42,7 +43,7 @@ jobs:
include: ${{fromJson(needs.setup_matrix.outputs.puppet_unit_test_matrix)}}
env:
BUNDLE_WITHOUT: development:system_tests:release
PUPPET_GEM_VERSION: "~> ${{ matrix.puppet }}.0"
PUPPET_GEM_VERSION: "~> ${{ matrix.puppet }}.24"
name: Unit / Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }})
steps:
- uses: actions/checkout@v2
Expand All @@ -60,6 +61,7 @@ jobs:
runs-on: ubuntu-latest
env:
BUNDLE_WITHOUT: development:test:release
PUPPET_GEM_VERSION: '~> 7.24'
strategy:
fail-fast: false
matrix:
Expand All @@ -68,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
18 changes: 18 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# Changelog

## [8.0.0](https://github.com/theforeman/puppet-pulpcore/tree/8.0.0) (2023-05-15)

[Full Changelog](https://github.com/theforeman/puppet-pulpcore/compare/7.2.0...8.0.0)

**Breaking changes:**

- Refs [\#36345](https://projects.theforeman.org/issues/36345) - Raise minimum Puppet version to 7.0.0 [\#281](https://github.com/theforeman/puppet-pulpcore/pull/281) ([ekohl](https://github.com/ekohl))
- Drop Pulpcore 3.16 - 3.18, add EL 9 support [\#277](https://github.com/theforeman/puppet-pulpcore/pull/277) ([ekohl](https://github.com/ekohl))

**Implemented enhancements:**

- Mark compatible with puppetlabs/postgresql 9.x & puppetlabs/apache 10.x & puppetlabs/concat 8.x [\#280](https://github.com/theforeman/puppet-pulpcore/pull/280) ([ekohl](https://github.com/ekohl))
- Mark compatible with puppet-systemd 4 [\#278](https://github.com/theforeman/puppet-pulpcore/pull/278) ([ekohl](https://github.com/ekohl))

**Merged pull requests:**

- Pin Puppet in CI [\#279](https://github.com/theforeman/puppet-pulpcore/pull/279) ([ekohl](https://github.com/ekohl))

## [7.2.0](https://github.com/theforeman/puppet-pulpcore/tree/7.2.0) (2023-03-06)

[Full Changelog](https://github.com/theforeman/puppet-pulpcore/compare/7.1.0...7.2.0)
Expand Down
12 changes: 2 additions & 10 deletions README.md
View file
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
View file
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
18 changes: 10 additions & 8 deletions metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "theforeman-pulpcore",
"version": "7.2.0",
"version": "8.0.0",
"author": "theforeman",
"summary": "Installs next generation Pulp server",
"license": "GPL-3.0-or-later",
"source": "https://github.com/theforeman/puppet-pulpcore",
"dependencies": [
{
"name": "puppetlabs/concat",
"version_requirement": ">= 4.0.0 < 8.0.0"
"version_requirement": ">= 4.0.0 < 9.0.0"
},
{
"name": "puppetlabs/stdlib",
Expand All @@ -20,15 +20,15 @@
},
{
"name": "puppetlabs/apache",
"version_requirement": ">= 5.4.0 < 9.0.0"
"version_requirement": ">= 5.4.0 < 11.0.0"
},
{
"name": "puppetlabs/postgresql",
"version_requirement": ">= 6.5.0 < 9.0.0"
"version_requirement": ">= 6.5.0 < 10.0.0"
},
{
"name": "puppet/systemd",
"version_requirement": ">= 2.2.0 < 4.0.0"
"version_requirement": ">= 2.2.0 < 5.0.0"
},
{
"name": "puppet/extlib",
Expand All @@ -39,20 +39,22 @@
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"8"
"8",
"9"
]
},
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"8"
"8",
"9"
]
}
],
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 6.1.0 < 8.0.0"
"version_requirement": ">= 7.0.0 < 8.0.0"
}
]
}
20 changes: 12 additions & 8 deletions spec/classes/repo_spec.rb
View file
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