From 7b7a6202ef7c1f5159d774674800caf31c9454f1 Mon Sep 17 00:00:00 2001 From: Odilon Sousa Date: Tue, 23 Sep 2025 09:52:00 -0300 Subject: [PATCH 1/3] Add support for Pulpcore 3.85 (cherry picked from commit d3ac6d8ed449b3274d70fdf35abf090bce0a0cb6) --- .github/workflows/ci.yml | 2 +- .sync.yml | 2 +- README.md | 6 +++++- manifests/repo.pp | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) 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/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, ) { From 7ad3dd1a9dfd3f0d236d1f552f4a23090e3d188d Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Thu, 4 Dec 2025 15:08:45 +0100 Subject: [PATCH 2/3] Add `After=postgresql.service` to all pulpcore services Before/After ensure ordering when starting and stopping services [1], thus ensuring that pulpcore services are started after PostgreSQL and stopped before. Especially the stopping part is important, as otherwise pulpcore workers fail to update their state in the DB, leading to odd upgrade issues where it seems like old workers are still active (as they exist in the DB). [1] https://www.freedesktop.org/software/systemd/man/latest/systemd.unit.html#After= (cherry picked from commit d3b868a2087616f7bf1873d484143f740cef165c) --- templates/pulpcore-api.service.erb | 2 +- templates/pulpcore-content.service.erb | 2 +- templates/pulpcore-worker@.service.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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] From e904d2b6a10dd6138d10bcafba3d1e0a668f0d10 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 8 Dec 2025 17:04:04 +0100 Subject: [PATCH 3/3] Release 13.3.0 --- CHANGELOG.md | 12 ++++++++++++ metadata.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) 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/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",