katello 4.16.1 → 4.17.0.rc2

data/app/models/katello/concerns/pulp_database_unit.rb

@@ -5,13 +5,11 @@ module Katello
     extend ActiveSupport::Concern
     #  Class.repository_association_class
     included do
-      if many_repository_associations
-        # rubocop:disable Rails/ReflectionClassName
-        has_many repository_association.to_sym, class_name: repository_association_class_name,
-                 dependent: :delete_all, inverse_of: association_name
-        has_many :repositories, through: repository_association.to_sym, class_name: "Katello::Repository"
-        include ::Katello::Concerns::SearchByRepositoryName
-      end
+      # rubocop:disable Rails/ReflectionClassName
+      has_many repository_association.to_sym, class_name: repository_association_class_name,
+               dependent: :delete_all, inverse_of: association_name
+      has_many :repositories, through: repository_association.to_sym, class_name: "Katello::Repository"
+      include ::Katello::Concerns::SearchByRepositoryName
     end
 
     def backend_data
@@ -50,10 +48,6 @@ module Katello
         "::Katello::Pulp::#{self.name.demodulize}".constantize
       end
 
-      def many_repository_associations
-        self != YumMetadataFile
-      end
-
       def repository_association
         repository_association_class_name.demodulize.pluralize.underscore
       end
@@ -86,27 +80,11 @@ module Katello
       end
 
       def copy_repository_associations(source_repo, dest_repo)
-        if many_repository_associations
-          delete_query = "delete from #{repository_association_class.table_name} where repository_id = #{dest_repo.id} and
-                         #{unit_id_field} not in (select #{unit_id_field} from #{repository_association_class.table_name} where repository_id = #{source_repo.id})"
-          ActiveRecord::Base.transaction do
-            ActiveRecord::Base.connection.execute(delete_query)
-            self.repository_association_class.import(db_columns_copy, db_values_copy(source_repo, dest_repo), validate: false)
-          end
-        else
-          columns = column_names - ["id", "pulp_id", "created_at", "updated_at", "repository_id"]
-          queries = []
-          queries << "delete from #{self.table_name} where repository_id = #{dest_repo.id} and
-                          pulp_id not in (select pulp_id from #{self.table_name} where repository_id = #{source_repo.id})"
-          queries << "insert into #{self.table_name} (repository_id, pulp_id, #{columns.join(',')})
-                    select #{dest_repo.id} as repository_id, pulp_id, #{columns.join(',')} from #{self.table_name}
-                    where repository_id = #{source_repo.id} and pulp_id not in (select pulp_id
-                    from #{self.table_name} where repository_id = #{dest_repo.id})"
-          ActiveRecord::Base.transaction do
-            queries.each do |query|
-              ActiveRecord::Base.connection.execute(query)
-            end
-          end
+        delete_query = "delete from #{repository_association_class.table_name} where repository_id = #{dest_repo.id} and
+                       #{unit_id_field} not in (select #{unit_id_field} from #{repository_association_class.table_name} where repository_id = #{source_repo.id})"
+        ActiveRecord::Base.transaction do
+          ActiveRecord::Base.connection.execute(delete_query)
+          self.repository_association_class.import(db_columns_copy, db_values_copy(source_repo, dest_repo), validate: false)
         end
       end
 
@@ -168,19 +146,11 @@ module Katello
       end
 
       def orphaned
-        if many_repository_associations
-          left_joins(repository_association.to_sym).where("#{repository_association_class.table_name}.#{unit_id_field}" => nil)
-        else
-          where.not(:repository_id => ::Katello::Repository.select(:id))
-        end
+        left_joins(repository_association.to_sym).where("#{repository_association_class.table_name}.#{unit_id_field}" => nil)
       end
 
       def in_repositories(repos)
-        if many_repository_associations
-          where(:id => repository_association_class.where(:repository_id => repos).select(unit_id_field))
-        else
-          where(:repository_id => repos)
-        end
+        where(:id => repository_association_class.where(:repository_id => repos).select(unit_id_field))
       end
 
       def pulp_data(pulp_id)

data/app/models/katello/concerns/smart_proxy_extensions.rb

@@ -602,6 +602,14 @@ module Katello
         repos_in_env_cv(environment, content_view) - repos_in_sync_history
       end
 
+      def up_to_date?(environment = nil, content_view = nil)
+        total_repos = repos_in_env_cv(environment, content_view)&.count
+        pending_sync = repos_pending_sync(environment, content_view)&.count
+        return true if pending_sync&.zero? && total_repos&.positive?
+        return false if total_repos.to_i == pending_sync.to_i
+        return 'partial'
+      end
+
       def rhsm_url
         # Since Foreman 3.1 this setting is set
         if (rhsm_url = setting(SmartProxy::PULP3_FEATURE, 'rhsm_url'))

data/app/models/katello/content_view.rb

@@ -71,6 +71,16 @@ module Katello
     validates :composite,
               inclusion: { in: [false], message: "Composite Content Views can not solve dependencies" },
               if: :solve_dependencies
+    validates :rolling, :inclusion => [true, false]
+    validates :rolling,
+              inclusion: { in: [false], message: "Rolling content views can not solve dependencies" },
+              if: :solve_dependencies
+    validates :rolling,
+              inclusion: { in: [false], message: "Rolling content views can not be composite" },
+              if: :composite
+    validates :rolling,
+              inclusion: { in: [false], message: "Rolling content views can not be import only" },
+              if: :import_only
     validates :import_only, :inclusion => [true, false]
     validates :import_only,
               inclusion: { in: [false], message: "Import-only Content Views can not be Composite" },
@@ -93,6 +103,8 @@ module Katello
     scope :non_default, -> { where(:default => false) }
     scope :composite, -> { where(:composite => true) }
     scope :non_composite, -> { where(:composite => [nil, false]) }
+    scope :rolling, -> { where(:rolling => true) }
+    scope :non_rolling, -> { where(:rolling => [nil, false]) }
     scope :generated, -> { where.not(:generated_for => :none) }
     scope :generated_for_repository, -> {
       where(:generated_for => [:repository_export,
@@ -113,6 +125,7 @@ module Katello
     scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :label, :complete_value => true
     scoped_search :on => :composite, :complete_value => { :true => true, :false => false }
+    scoped_search :on => :rolling, :complete_value => { :true => true, :false => false }
     scoped_search :on => :generated_for, :complete_value => true
     scoped_search :on => :default # just for ordering
     scoped_search :on => :name, :complete_value => true,
@@ -804,7 +817,7 @@ module Katello
     end
 
     def unpublishable?
-      default? || import_only? || generated?
+      default? || import_only? || generated? || rolling?
     end
 
     def needs_publish?

data/app/models/katello/content_view_component.rb

@@ -53,6 +53,10 @@ module Katello
         errors.add(:base, _("Cannot add default content view to composite content view"))
       end
 
+      if view.rolling?
+        errors.add(:base, _("Cannot add rolling content view to composite content view"))
+      end
+
       if attached_content_view_ids.include?(view.id)
         errors.add(:base, _("Another component already includes content view with ID %s" % view.id))
       end

data/app/models/katello/content_view_environment.rb

@@ -21,6 +21,7 @@ module Katello
     validates_lengths_from_database
     validates :environment_id, uniqueness: {scope: :content_view_id}, presence: true
     validates :content_view_id, presence: true
+    validates :content_view_version_id, presence: true
     validates_with Validators::ContentViewEnvironmentOrgValidator
     validates_with Validators::ContentViewEnvironmentCoherentDefaultValidator
 

data/app/models/katello/content_view_version.rb

@@ -45,6 +45,7 @@ module Katello
              :class_name => "Katello::ContentViewVersion", :inverse_of => :components
     has_many :published_in_composite_content_views, through: :composites, source: :content_view
     delegate :default, :default?, to: :content_view
+    delegate :rolling, :rolling?, to: :content_view
 
     validates_lengths_from_database
 
@@ -185,7 +186,7 @@ module Katello
     end
 
     def archived_repos
-      self.default? ? self.repositories : self.repos(nil)
+      (self.default? || self.rolling?) ? self.repositories : self.repos(nil)
     end
 
     def non_archive_repos
@@ -389,7 +390,7 @@ module Katello
     end
 
     def check_ready_to_promote!(to_env)
-      fail _("Default content view versions cannot be promoted") if default?
+      fail _("Default and Rolling content view versions cannot be promoted") if default? || rolling?
       content_view.check_composite_action_allowed!(to_env)
       content_view.check_docker_repository_names!(to_env)
       content_view.check_orphaned_content_facets!(environments: [to_env])

data/app/models/katello/host/content_facet.rb

@@ -105,6 +105,14 @@ module Katello
         bootc_booted_image.present?
       end
 
+      def yum_or_yum_transient
+        if image_mode_host?
+          'dnf --transient'
+        else
+          'yum'
+        end
+      end
+
       def cves_changed?
         cves_changed
       end
@@ -149,6 +157,7 @@ module Katello
       end
 
       # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       def assign_single_environment(
         content_view_id: nil, lifecycle_environment_id: nil, environment_id: nil,
         content_view: nil, lifecycle_environment: nil, environment: nil
@@ -165,11 +174,15 @@ module Katello
         end
 
         content_view_environment = ::Katello::ContentViewEnvironment
-          .where(:content_view_id => content_view_id, :environment_id => lifecycle_environment_id)
-          .first_or_create do |cve|
-          Rails.logger.info("ContentViewEnvironment not found for content view '#{cve.content_view_name}' and environment '#{cve.environment&.name}'; creating a new one.")
+          .find_by(:content_view_id => content_view_id, :environment_id => lifecycle_environment_id)
+        if content_view_environment.nil?
+          env_label = ::Katello::KTEnvironment.find_by(:id => lifecycle_environment_id)&.label
+          fail ::Katello::Errors::ContentViewEnvironmentError, _("Unable to find a lifecycle environment with ID %s") % lifecycle_environment_id if env_label.nil?
+          cv_label = ::Katello::ContentView.find_by(:id => content_view_id)&.label
+          fail ::Katello::Errors::ContentViewEnvironmentError, _("Unable to find a content view with ID %s") % content_view_id if cv_label.nil?
+          hypothetical_cve_label = "%s/%s" % [env_label, cv_label]
+          fail ::Katello::Errors::ContentViewEnvironmentError, _("Cannot assign content view environment %s: The content view has either not been published or has not been promoted to that lifecycle environment.") % hypothetical_cve_label
         end
-        fail _("Unable to create ContentViewEnvironment. Check the logs for more information.") if content_view_environment.nil?
 
         self.content_view_environments = [content_view_environment]
       end
@@ -453,7 +466,7 @@ module Katello
               :errata_counts, :id, :kickstart_repository, :kickstart_repository_id, :kickstart_repository_name,
               :upgradable_deb_count, :upgradable_module_stream_count, :upgradable_rpm_count, :uuid,
               :installable_security_errata_count, :installable_bugfix_errata_count, :installable_enhancement_errata_count,
-              :single_content_view, :single_lifecycle_environment, :content_view_environment_labels
+              :single_content_view, :single_lifecycle_environment, :content_view_environment_labels, :yum_or_yum_transient
       end
     end
   end

data/app/models/katello/product_content.rb

@@ -45,7 +45,9 @@ module Katello
     end
 
     def self.enabled(organization)
-      joins(:content).where("#{self.content_table_name}.cp_content_id" => Katello::RootRepository.in_organization(organization).select(:content_id))
+      content_ids = Katello::RootRepository.in_organization(organization).where.not(content_id: nil).pluck(:content_id)
+      structured_apt_content_ids = Katello::Repository.in_organization(organization).library.pluck(:content_id)
+      joins(:content).where("#{self.content_table_name}.cp_content_id" => content_ids + structured_apt_content_ids)
     end
 
     def self.with_valid_subscription(organization)

data/app/models/katello/repository.rb

@@ -72,8 +72,6 @@ module Katello
     has_many :repository_docker_manifest_lists, :class_name => "Katello::RepositoryDockerManifestList", :dependent => :delete_all
     has_many :docker_manifest_lists, :through => :repository_docker_manifest_lists
 
-    has_many :yum_metadata_files, :dependent => :destroy, :class_name => "Katello::YumMetadataFile"
-
     has_many :repository_docker_tags, :class_name => "Katello::RepositoryDockerTag", :dependent => :delete_all
     has_many :docker_tags, :through => :repository_docker_tags
 
@@ -718,6 +716,8 @@ module Katello
     def archived_instance
       if self.environment_id.nil? || self.library_instance_id.nil?
         self
+      elsif self.content_view.rolling?
+        self.library_instance
       else
         self.content_view_version.archived_repos.where(:root_id => self.root_id).first
       end
@@ -1057,7 +1057,7 @@ module Katello
       return [] if version_href.blank?
 
       pulp_api = Katello::Pulp3::Repository.instance_for_type(self, SmartProxy.pulp_primary).api.content_release_components_api
-      pulp_api.list({:repository_version => version_href}).results.map { |x| x.component }.uniq
+      pulp_api.list({:repository_version => version_href}).results.map { |x| x.plain_component }.uniq
     end
 
     def deb_sanitize_pulp_distribution(distribution)

data/app/services/katello/content_unit_indexer.rb

@@ -56,7 +56,7 @@ module Katello
         import_associations(units) if @repository
       end
 
-      if @model_class.many_repository_associations && @repository
+      if @repository
         sync_repository_associations(association_tracker, additive: filtered_indexing)
       end
     end

data/app/services/katello/pulp3/api/content_guard.rb

@@ -66,7 +66,7 @@ module Katello
         end
 
         def partial_update(href)
-          data = PulpCertguardClient::CertguardRHSMCertGuard.new(ca_certificate: ca_cert)
+          data = { ca_certificate: ca_cert }
           rhsm_api_client.partial_update(href, data)
         end
 

data/app/services/katello/pulp3/api/core.rb

@@ -211,6 +211,12 @@ module Katello
           self.class.fetch_from_list { |page_opts| repository_versions_api.list(repository_href, page_opts.merge(options)) }
         end
 
+        def publications_list_all(args = {})
+          self.class.fetch_from_list do |page_opts|
+            publications_api.list(page_opts.merge(args))
+          end
+        end
+
         def distributions_list_all(args = {})
           self.class.fetch_from_list do |page_opts|
             distributions_api.list(page_opts.merge(args))

data/app/services/katello/pulp3/smart_proxy_mirror_repository.rb

@@ -37,6 +37,62 @@ module Katello
         repo_version_map
       end
 
+      def report_misconfigured_repository_version(api, href)
+        # Reasons for distributions distributing orphaned repository versions:
+        # 1. The sync succeeded but Pulp did not update the publication (yum content)
+        #    - Fix: completely resync the repository to the smart proxy (need to verify)
+        # 2. The sync suceeded but metadata was not generated (non-yum content)
+        #    - Fix: completely resync the repository on the smart proxy (need to verify)
+        # 3. A repository, distribution, and publication was lost track of
+        #    - Fix: same as 4
+        # 4. Pulp content was modified outside of Katello
+        #    - Fix: find repositories outside of Katello and delete them. Deleting the entire repo works and leaves an orphaned distribution.
+        #        - If RemoveUnneededRepos goes first, this should be taken care of.
+        # 5. An older repository version has a distribution, but the repository is not an orphan
+        #    - Fix: delete the orphan distribution
+        errors = []
+        related_distributions = if api.repository_type.publications_api_class.present?
+                                  publication_hrefs = api.publications_list_all(repository_version: href).map(&:pulp_href)
+                                  # Searching distributions by publication isn't supported
+                                  api.distributions_list_all.select { |dist| publication_hrefs.include? dist.publication }
+                                else
+                                  # Searching distributions by repository version isn't supported
+                                  api.distributions_list_all.select { |dist| dist.repository_version == href }
+                                end
+        repositories_to_redistribute = ::Katello::Repository.where(pulp_id: related_distributions.map(&:name))
+        if repositories_to_redistribute.present?
+          warning = "Completely resync (skip metadata check) repositories with the following paths to the smart proxy with ID #{smart_proxy.id}: " \
+                    "#{repositories_to_redistribute.map(&:relative_path).join(', ')}. " \
+                    "Orphan cleanup is skipped for these repositories until they are fixed on smart proxy with ID #{smart_proxy.id}. " \
+                    "Try `hammer capsule content synchronize --id #{smart_proxy.id} --skip-metadata-check 1 ...` using " \
+                    "--repository-id with #{repositories_to_redistribute.map(&:id).join(', ')}."
+          errors << warning
+          Rails.logger.warn(warning)
+        end
+        Rails.logger.debug("Orphan cleanup error: investigate the version_href #{href} on the smart proxy with ID #{smart_proxy.id} " \
+                            "and the related distributions #{related_distributions.map(&:pulp_href)}")
+        Rails.logger.debug('It is likely that the related distributions are distributing an older version of the repository.')
+        errors
+      end
+
+      # See app/services/katello/pulp3/smart_proxy_repository.rb#delete_orphan_repository_versions for foreman orphan cleanup
+      def delete_orphan_repository_versions
+        tasks = []
+        errors = []
+        orphan_repository_versions.each do |api, version_hrefs|
+          version_hrefs.each do |href|
+            tasks << api.repository_versions_api.delete(href)
+          rescue => e
+            if e.message.include?('Please update the necessary distributions first.')
+              errors << report_misconfigured_repository_version(api, href)
+            else
+              raise e
+            end
+          end
+        end
+        { pulp_tasks: tasks.flatten, errors: errors.flatten }
+      end
+
       def delete_orphan_repositories
         tasks = []
 
@@ -70,7 +126,8 @@ module Katello
       def self.orphan_distribution?(distribution)
         distribution.try(:publication).nil? &&
             distribution.try(:repository).nil? &&
-            distribution.try(:repository_version).nil?
+            distribution.try(:repository_version).nil? ||
+            ::Katello::Repository.pluck(:pulp_id).exclude?(distribution.name)
       end
 
       def delete_orphan_alternate_content_sources

data/app/services/katello/pulp3/smart_proxy_repository.rb

@@ -33,14 +33,53 @@ module Katello
         katello_repos.select { |repo| repo_ids.include? repo.pulp_id }
       end
 
+      def report_misconfigured_repository_version(api, href)
+        errors = []
+        related_distributions = if api.repository_type.publications_api_class.present?
+                                  publication_hrefs = api.publications_list_all(repository_version: href).map(&:pulp_href)
+                                  # Searching distributions by publication isn't supported
+                                  api.distributions_list_all.select { |dist| publication_hrefs.include? dist.publication }
+                                else
+                                  # Searching distributions by repository version isn't supported
+                                  api.distributions_list_all.select { |dist| dist.repository_version == href }
+                                end
+        repositories_to_redistribute = ::Katello::Repository.joins(:distribution_references)
+          .where(:distribution_references => { :href => related_distributions.map(&:pulp_href) })
+        if repositories_to_redistribute.present?
+          warning = 'Completely resync (skip metadata check) or regenerate metadata for repositories with the following paths: ' \
+                    "#{repositories_to_redistribute.map(&:relative_path).join(', ')}. " \
+                    "Orphan cleanup is skipped for these repositories until they are fixed on smart proxy with ID #{smart_proxy.id}. "
+          if repositories_to_redistribute.in_default_view.any?
+            warning += "Try `hammer repository synchronize --skip-metadata-check 1 ...` using --id with #{repositories_to_redistribute.in_default_view.map(&:id).join(', ')}. " \
+          end
+          if repositories_to_redistribute.in_non_default_view.any?
+            warning += "Try `hammer content-view version republish-repositories ...` using --id with #{repositories_to_redistribute.in_non_default_view.pluck(:content_view_version_id).uniq.join(', ')}." \
+          end
+          errors << warning
+          Rails.logger.warn(warning)
+        end
+        Rails.logger.debug("Orphan cleanup error: investigate the version_href #{href} " \
+                          "and the related distributions #{related_distributions.map(&:pulp_href)}")
+        Rails.logger.debug('It is likely that the related distributions are distributing an older version of the repository.')
+        errors
+      end
+
+      # See app/services/katello/pulp3/smart_proxy_mirror_repository.rb#delete_orphan_repository_versions for content proxy orphan cleanup
       def delete_orphan_repository_versions
         tasks = []
+        errors = []
         orphan_repository_versions.each do |api, version_hrefs|
-          tasks << version_hrefs.collect do |href|
-            api.repository_versions_api.delete(href)
+          version_hrefs.each do |href|
+            tasks << api.repository_versions_api.delete(href)
+          rescue => e
+            if e.message.include?('Please update the necessary distributions first.')
+              errors << report_misconfigured_repository_version(api, href)
+            else
+              raise e
+            end
           end
         end
-        tasks.flatten
+        { pulp_tasks: tasks.flatten, errors: errors.flatten }
       end
 
       def pulp3_enabled_repo_types
@@ -49,6 +88,31 @@ module Katello
         end
       end
 
+      def orphan_distributions
+        # Each key is a Pulp 3 plugin API and each value is the list of version_hrefs
+        distribution_map = {}
+        pulp3_enabled_repo_types.each do |repo_type|
+          api = repo_type.pulp3_api(smart_proxy)
+          katello_dist_hrefs = ::Katello::RootRepository.where(content_type: repo_type.id)
+                                .joins(:repositories => :distribution_references)
+                                .pluck(:href)
+          pulp_dist_hrefs = api.distributions_list_all.map(&:pulp_href)
+          distribution_map[api] = pulp_dist_hrefs - katello_dist_hrefs
+        end
+
+        distribution_map
+      end
+
+      def delete_orphan_distributions
+        tasks = []
+        orphan_distributions.each do |api, hrefs|
+          tasks << hrefs.collect do |href|
+            api.distributions_api.delete(href)
+          end
+        end
+        tasks.flatten
+      end
+
       def orphan_repository_versions
         # Each key is a Pulp 3 plugin API and each value is the list of version_hrefs
         repo_version_map = {}

data/app/services/katello/smart_proxy_helper.rb

@@ -1,5 +1,6 @@
 module Katello
   class SmartProxyHelper
+    include ::Actions::Helpers::RollingCVRepos
     attr_accessor :smart_proxy
 
     def initialize(smart_proxy)
@@ -39,7 +40,11 @@ module Katello
     def combined_repos_available_to_capsule(environment = nil, content_view = nil, repository = nil)
       lifecycle_environment_check(environment, repository)
       if repository && !library_export_repo(repository)
-        [repository]
+        if repository.library_instance?
+          [repository] + find_related_rolling_repos(repository)
+        else
+          [repository]
+        end
       else
         repositories_available_to_capsule(environment, content_view)
       end

data/app/views/foreman/job_templates/install_errata_-_katello_ansible_default.erb

@@ -20,6 +20,20 @@ kind: job_template
 <%= render_template('Run Command - Ansible Default', :command => "zypper -n install -t patch #{advisories}") %>
 <% else -%>
 <% advisories = input(:errata).split(',').map { |e| "--advisory=#{e}" }.join(' ') -%>
-<%= render_template('Run Command - Ansible Default', :command => "yum -y update-minimal #{advisories}") %>
+---
+- hosts: all
+  tasks:
+<%= indent(4) { snippet('check_bootc_status') } %>
+    - name: Install errata via dnf for image mode machines
+      shell:
+        cmd: 'dnf -y --transient update-minimal <%= advisories %>'
+      register: out
+      when: is_bootc_host
+    - name: Install errata normally
+      shell:
+        cmd: 'yum -y update-minimal <%= advisories %>'
+      register: out
+      when: not is_bootc_host
+    - debug: var=out
 <% end -%>
 <%= snippet_if_exists(template_name + " custom post") %>

data/app/views/foreman/job_templates/install_errata_by_search_query_-_katello_ansible_default.erb

@@ -21,6 +21,20 @@ template_inputs:
 <%= render_template('Run Command - Ansible Default', :command => "zypper -n install -t patch #{advisory_ids.join(' ')}") %>
 <% else -%>
 <% advisories = advisory_ids.map { |e| "--advisory=#{e}" }.join(' ') -%>
-<%= render_template('Run Command - Ansible Default', :command => "yum -y update-minimal #{advisories}") %>
+---
+- hosts: all
+  tasks:
+<%= indent(4) { snippet('check_bootc_status') } %>
+    - name: Install errata via dnf for image mode machines
+      shell:
+        cmd: 'dnf -y --transient update-minimal <%= advisories %>'
+      register: out
+      when: is_bootc_host
+    - name: Install errata normally
+      shell:
+        cmd: 'yum -y update-minimal <%= advisories %>'
+      register: out
+      when: not is_bootc_host
+    - debug: var=out
 <% end -%>
 <%= snippet_if_exists(template_name + " custom post") %>

data/app/views/foreman/job_templates/install_group_-_katello_ansible_default.erb

@@ -12,5 +12,18 @@ template_inputs:
 provider_type: Ansible
 kind: job_template
 %>
-
-<%= render_template('Run Command - Ansible Default', :command => "yum -y group install #{input('package')}") %>
+---
+- hosts: all
+  tasks:
+<%= indent(4) { snippet('check_bootc_status') } %>
+    - name: Install groups via dnf for image mode machines
+      shell:
+        cmd: 'dnf -y --transient groupinstall <%= input('package') %>'
+      register: out
+      when: is_bootc_host
+    - name: Install groups normally
+      shell:
+        cmd: 'yum -y groupinstall <%= input('package') %>'
+      register: out
+      when: not is_bootc_host
+    - debug: var=out

data/app/views/foreman/job_templates/install_packages_by_search_query_-_katello_ansible_default.erb

@@ -18,11 +18,30 @@ template_inputs:
 ---
 - hosts: all
   tasks:
-    - package:
+<%= indent(4) { snippet('check_bootc_status') } %>
+    - name: Enable bootc overlay
+      shell:
+        cmd: 'bootc usr-overlay'
+      register: out
+      ignore_errors: true
+      when: is_bootc_host
+    - debug: var=out
+    - name: Install packages via dnf for image mode machines
+      package:
+        use: 'dnf'
 <% if package_names.empty? -%>
         name: []
 <% else -%>
         name: <%= indent(10) { to_yaml(package_names).gsub(/---/, "") } -%>
         state: present
 <% end -%>
-
+      when: is_bootc_host
+    - name: Install packages normally
+      package:
+<% if package_names.empty? -%>
+        name: []
+<% else -%>
+        name: <%= indent(10) { to_yaml(package_names).gsub(/---/, "") } -%>
+        state: present
+<% end -%>
+      when: not is_bootc_host

data/app/views/foreman/job_templates/remove_group_-_katello_ansible_default.erb

@@ -13,4 +13,18 @@ provider_type: Ansible
 kind: job_template
 %>
 
-<%= render_template('Run Command - Ansible Default', :command => "yum -y group remove #{input('package')}") %>
+---
+- hosts: all
+  tasks:
+<%= indent(4) { snippet('check_bootc_status') } %>
+    - name: Remove groups via dnf for image mode machines
+      shell:
+        cmd: 'dnf -y --transient group remove <%= input('package') %>'
+      register: out
+      when: is_bootc_host
+    - name: Remove groups normally
+      shell:
+        cmd: 'yum -y group remove <%= input('package') %>'
+      register: out
+      when: not is_bootc_host
+    - debug: var=out

data/app/views/foreman/job_templates/remove_packages_by_search_query_-_katello_ansible_default.erb

@@ -18,9 +18,28 @@ template_inputs:
 ---
 - hosts: all
   tasks:
-    - package:
+<%= indent(4) { snippet('check_bootc_status') } %>
+    - name: Enable bootc overlay
+      shell:
+        cmd: 'bootc usr-overlay'
+      register: out
+      ignore_errors: true
+      when: is_bootc_host
+    - debug: var=out
+    - name: Remove packages via dnf for image mode machines
+      package:
         name:
 <% package_names.each do |package_name| -%>
           - <%= package_name %>
 <% end -%>
         state: absent
+        use: 'dnf'
+      when: is_bootc_host
+    - name: Remove packages normally
+      package:
+        name:
+<% package_names.each do |package_name| -%>
+          - <%= package_name %>
+<% end -%>
+        state: absent
+      when: not is_bootc_host