diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f4b93e8..76a3a14b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,5 +20,5 @@ jobs: uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3 with: pidfile_workaround: 'false' - beaker_facter: 'pulpcore_version:Pulp:nightly,3.49,3.63,3.73' + beaker_facter: 'pulpcore_version:Pulp:nightly,3.49,3.63,3.73,3.85' rubocop: false diff --git a/.sync.yml b/.sync.yml index ebc3d256..8c013ecc 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,3 +1,3 @@ --- .github/workflows/ci.yml: - beaker_facter: 'pulpcore_version:Pulp:nightly,3.49,3.63,3.73' + beaker_facter: 'pulpcore_version:Pulp:nightly,3.49,3.63,3.73,3.85' diff --git a/CHANGELOG.md b/CHANGELOG.md index 78f4b258..1b193b3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [13.3.0](https://github.com/theforeman/puppet-pulpcore/tree/13.3.0) (2025-12-08) + +[Full Changelog](https://github.com/theforeman/puppet-pulpcore/compare/13.2.0...13.3.0) + +**Implemented enhancements:** + +- Add support for Pulpcore 3.85 [\#392](https://github.com/theforeman/puppet-pulpcore/pull/392) ([Odilhao](https://github.com/Odilhao)) + +**Fixed bugs:** + +- Add `After=postgresql.service` to all pulpcore services [\#395](https://github.com/theforeman/puppet-pulpcore/pull/395) ([evgeni](https://github.com/evgeni)) + ## [13.2.0](https://github.com/theforeman/puppet-pulpcore/tree/13.2.0) (2025-11-05) [Full Changelog](https://github.com/theforeman/puppet-pulpcore/compare/13.1.0...13.2.0) diff --git a/README.md b/README.md index b9cc2576..e5a0f052 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,14 @@ All supported versions are listed below. For every supported version, acceptance Supported operating systems are listed in `metadata.json` but individual releases can divert from that. For example, if Pulpcore x.y drops EL7, it will still be listed in metadata.json until all versions supported by the module have dropped it. Similarly, if x.z adds support for EL9, it'll be listed in `metadata.json` and all versions that don't support EL9 will have a note. -### Pulpcore 3.73 +### Pulpcore 3.85 Recommended version. +### Pulpcore 3.73 + +Supported version. + ### Pulpcore 3.63 Supported version. diff --git a/manifests/repo.pp b/manifests/repo.pp index b97ec97e..9f1e4f2f 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -8,7 +8,7 @@ # An optional value for gpgkey to be used for yumrepo, instead of the default. # If an empty string is passed, gpgcheck will be disabled. class pulpcore::repo ( - Variant[Enum['nightly'], Pattern['^\d+\.\d+$']] $version = '3.73', + Variant[Enum['nightly'], Pattern['^\d+\.\d+$']] $version = '3.85', Optional[Stdlib::HTTPUrl] $baseurl = undef, Optional[String[0]] $gpgkey = undef, ) { diff --git a/metadata.json b/metadata.json index 448d84ba..221f7876 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "theforeman-pulpcore", - "version": "13.2.0", + "version": "13.3.0", "author": "theforeman", "summary": "Installs next generation Pulp server", "license": "GPL-3.0-or-later", diff --git a/templates/pulpcore-api.service.erb b/templates/pulpcore-api.service.erb index cd5d10ee..44a2a32f 100644 --- a/templates/pulpcore-api.service.erb +++ b/templates/pulpcore-api.service.erb @@ -1,6 +1,6 @@ [Unit] Description=Pulp API Server -After=network.target +After=network.target postgresql.service Requires=pulpcore-api.socket Wants=postgresql.service diff --git a/templates/pulpcore-content.service.erb b/templates/pulpcore-content.service.erb index d972dd5e..e8a5ddea 100644 --- a/templates/pulpcore-content.service.erb +++ b/templates/pulpcore-content.service.erb @@ -1,7 +1,7 @@ [Unit] Description=Pulp Content App Requires=pulpcore-content.socket -After=network.target +After=network.target postgresql.service Wants=postgresql.service [Service] diff --git a/templates/pulpcore-worker@.service.erb b/templates/pulpcore-worker@.service.erb index 2f4f3cc1..05ca07f2 100644 --- a/templates/pulpcore-worker@.service.erb +++ b/templates/pulpcore-worker@.service.erb @@ -1,6 +1,6 @@ [Unit] Description=Pulp Worker -After=network-online.target +After=network-online.target postgresql.service Wants=network-online.target postgresql.service [Service]