Drop Pulpcore 3.14 & 3.15, move to 3.16 & 3.17

.github/workflows/ci.yml

@@ -66,8 +66,8 @@ jobs:
         setfile: ${{fromJson(needs.setup_matrix.outputs.beaker_setfiles)}}
         puppet: ${{fromJson(needs.setup_matrix.outputs.puppet_major_versions)}}
         pulpcore_version:
-          - '3.15'
-          - '3.14'
+          - '3.17'
+          - '3.16'
     name: Acceptance / ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }} - Pulp ${{ matrix.pulpcore_version }}
     steps:
       - uses: actions/checkout@v2

README.md

@@ -10,15 +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.15
+### Pulpcore 3.17
 
 Default recommended version.
 
-Starting Pulpcore 3.15 the migration plugin is no longer built. Users should remove the plugin prior to upgrding. The [foreman_maintain Pulp 2 removal procedure](https://github.com/theforeman/foreman_maintain/blob/d49ece67f1dba761bb232229593765f61e01361a/definitions/procedures/pulp/remove.rb#L109-L160) is a good reference. Additionally the package `python3-pulp-2to3-migration` should be removed.
+### Pulpcore 3.16
 
-### Pulpcore 3.14
-
-At least pulpcore 3.14.8-2 (and matching plugins) should be used, as this version introduced virtual package names that are used in this module. Certguard 1.4.0-3 should be used to pull in the correct RHSM package.
+Supported
 
 ## Installation layout
 

manifests/init.pp

@@ -139,11 +139,6 @@
 #   You should not need to modify this setting unless the application reports workers timing out while they are busy completing tasks.
 #   Modification should be performed incrementally to determine the least value that prevents false positive worker timeouts.
 #
-# @param use_rq_tasking_system
-#   Use the older RQ workers tasking system instead of the newer PostgreSQL tasking system introduced in Pulpcore 3.14. This is deprecated in 3.15.
-#   Any benchmarking you did to optimize worker_count or other tasking related parameters will no longer be accurate after changing the tasking system.
-#   Do not modify this setting unless you understand the implications for performance and stability.
-#
 # @param service_enable
 #   Enable/disable Pulp services at boot.
 #
@@ -219,7 +214,6 @@
   String[1] $remote_user_environ_name = 'HTTP_REMOTE_USER',
   Integer[0] $worker_count = min(8, $facts['processors']['count']),
   Optional[Integer[0]] $worker_ttl = undef,
-  Boolean $use_rq_tasking_system = false,
   Boolean $service_enable = true,
   Boolean $service_ensure = true,
   Integer[0] $content_service_worker_count = (2*min(8, $facts['processors']['count']) + 1),

manifests/repo.pp

@@ -3,7 +3,7 @@
 # @param version
 #   The Pulpcore version to use
 class pulpcore::repo (
-  Pattern['^\d+\.\d+$'] $version = '3.15',
+  Pattern['^\d+\.\d+$'] $version = '3.17',
 ) {
   $context = {
     'version'   => $version,

manifests/service.pp

@@ -18,18 +18,11 @@
     service_content => template('pulpcore/pulpcore-content.service.erb'),
   }
 
-  if $pulpcore::use_rq_tasking_system {
-    systemd::unit_file { 'pulpcore-resource-manager.service':
-      content => template('pulpcore/pulpcore-resource-manager.service.erb'),
-      active  => $pulpcore::service_ensure,
-      enable  => $pulpcore::service_enable,
-    }
-  } else {
-    systemd::unit_file { 'pulpcore-resource-manager.service':
-      ensure => 'absent',
-      active => false,
-      enable => false,
-    }
+  # Clean up the RQ tasking system which 3.16 removed
+  systemd::unit_file { 'pulpcore-resource-manager.service':
+    ensure => 'absent',
+    active => false,
+    enable => false,
   }
 
   systemd::unit_file { 'pulpcore-worker@.service':

spec/acceptance/basic_spec.rb

@@ -65,8 +65,7 @@
   end
 
   describe curl_command("https://#{host_inventory['fqdn']}/pulp/api/v3/", cacert: "#{certdir}/ca-cert.pem") do
-    its(:response_code) { is_expected.to eq(200) }
-    its(:body) { is_expected.not_to contain('artifacts_list') }
+    its(:response_code) { is_expected.to eq(403) }
     its(:exit_status) { is_expected.to eq 0 }
   end
 
@@ -78,13 +77,6 @@
   end
 
   describe command("PULP_SETTINGS=/etc/pulp/settings.py pulpcore-manager diffsettings") do
-    its(:stdout) { is_expected.to match(/^USE_NEW_WORKER_TYPE = True/) }
-    its(:exit_status) { is_expected.to eq 0 }
-  end
-
-  describe command("DJANGO_SETTINGS_MODULE=pulpcore.app.settings PULP_SETTINGS=/etc/pulp/settings.py /usr/libexec/pulpcore/rq info -c pulpcore.rqconfig") do
-    its(:stdout) { is_expected.to match(/^0 workers, /) }
-    its(:stdout) { is_expected.not_to match(/^resource-manager /) }
     its(:exit_status) { is_expected.to eq 0 }
   end
 end