diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03a660f..4bb74b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,6 @@ jobs: uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2 with: pidfile_workaround: 'false' - beaker_facter: 'pulpcore_version:Pulp:3.28,3.22,3.21' + beaker_facter: 'pulpcore_version:Pulp:nightly,3.39' rubocop: false cache-version: '1' diff --git a/.sync.yml b/.sync.yml index 38127cd..84ff4b1 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,3 +1,3 @@ --- .github/workflows/ci.yml: - beaker_facter: 'pulpcore_version:Pulp:3.28,3.22,3.21' + beaker_facter: 'pulpcore_version:Pulp:nightly,3.39' diff --git a/README.md b/README.md index 31bfc02..9bc78ef 100644 --- a/README.md +++ b/README.md @@ -10,21 +10,13 @@ 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.28 +### Pulpcore nightly -Default recommended version. - -### Pulpcore 3.22 - -Supported version. +The latest version of Pulpcore that is being tested. -### Pulpcore 3.21 +### Pulpcore 3.39 -Supported version. The parameter `$hide_guarded_distributions` doesn't work since it's a Pulp 3.22 feature. - -### Pulpcore 3.16 - 3.18 - -Untested, but should work besides the `$hide_guarded_distributions` parameter. Not recommended. +Default recommended version. ## Installation layout diff --git a/manifests/repo.pp b/manifests/repo.pp index a0203fe..c76b675 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -3,7 +3,7 @@ # @param version # The Pulpcore version to use class pulpcore::repo ( - Variant[Enum['nightly'], Pattern['^\d+\.\d+$']] $version = '3.28', + Variant[Enum['nightly'], Pattern['^\d+\.\d+$']] $version = '3.39', ) { $dist_tag = "el${facts['os']['release']['major']}" $context = { diff --git a/templates/pulpcore-api.service.erb b/templates/pulpcore-api.service.erb index 6dd2b1a..729c3f7 100644 --- a/templates/pulpcore-api.service.erb +++ b/templates/pulpcore-api.service.erb @@ -11,7 +11,7 @@ User=<%= scope['pulpcore::user'] %> Group=<%= scope['pulpcore::group'] %> WorkingDirectory=<%= scope['pulpcore::user_home'] %> RuntimeDirectory=pulpcore-api -ExecStart=/usr/libexec/pulpcore/gunicorn pulpcore.app.wsgi:application \ +ExecStart=/usr/bin/pulpcore-api \ --preload \ --timeout <%= scope['pulpcore::api_service_worker_timeout'] %> \ --workers <%= scope['pulpcore::api_service_worker_count'] %> \ diff --git a/templates/pulpcore-content.service.erb b/templates/pulpcore-content.service.erb index abfd0e6..c23688c 100644 --- a/templates/pulpcore-content.service.erb +++ b/templates/pulpcore-content.service.erb @@ -11,10 +11,9 @@ User=<%= scope['pulpcore::user'] %> Group=<%= scope['pulpcore::group'] %> WorkingDirectory=<%= scope['pulpcore::user_home'] %> RuntimeDirectory=pulpcore-content -ExecStart=/usr/libexec/pulpcore/gunicorn pulpcore.content:server \ +ExecStart=/usr/bin/pulpcore-content \ --preload \ --timeout <%= scope['pulpcore::content_service_worker_timeout'] %> \ - --worker-class 'aiohttp.GunicornWebWorker' \ --workers <%= scope['pulpcore::content_service_worker_count'] %> \ --access-logfile - ExecReload=/bin/kill -s HUP $MAINPID