katello 4.16.0 → 4.17.0.rc1

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

data/app/views/foreman/job_templates/update_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 update #{input('package')}") %>
+---
+- hosts: all
+  tasks:
+<%= indent(4) { snippet('check_bootc_status') } %>
+    - name: Update groups via dnf for image mode machines
+      shell:
+        cmd: 'dnf -y --transient group update <%= input('package') %>'
+      register: out
+      when: is_bootc_host
+    - name: Update groups normally
+      shell:
+        cmd: 'yum -y group update <%= input('package') %>'
+      register: out
+      when: not is_bootc_host
+    - debug: var=out

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

@@ -27,7 +27,23 @@ 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:
         name: <%= indent(10) { to_yaml(package_names).gsub(/---/, "") } -%>
         state: latest
+        use: 'dnf'
+      when: is_bootc_host
+    - name: Install packages normally
+      package:
+        name: <%= indent(10) { to_yaml(package_names).gsub(/---/, "") } -%>
+        state: latest
+      when: not is_bootc_host
 <% end -%>

data/app/views/katello/api/v2/activation_keys/base.json.rabl

@@ -13,6 +13,7 @@ child :content_view_environments => :content_view_environments do
       id: cve.content_view&.id,
       name: cve.content_view&.name,
       composite: cve.content_view&.composite,
+      rolling: cve.content_view&.rolling,
       content_view_version: cve.content_view_version&.version,
       content_view_version_id: cve.content_view_version&.id,
       content_view_version_latest: cve.content_view_version&.latest?,

data/app/views/katello/api/v2/capsule_content/sync_status.json.rabl

@@ -67,9 +67,10 @@ child @lifecycle_environments => :lifecycle_environments do
           :label => content_view.label,
           :name => content_view.name,
           :composite => content_view.composite,
+          :rolling => content_view.rolling,
           :last_published => content_view.versions.empty? ? nil : content_view.versions.in_environment(env).first&.created_at,
           :default => content_view.default,
-          :up_to_date => @capsule.repos_pending_sync(env, content_view).empty?,
+          :up_to_date => @capsule.up_to_date?(env, content_view),
           :counts => {
             :repositories => ::Katello::ContentViewVersion.in_environment(env).find_by(:content_view => content_view)&.archived_repos&.count,
           },

data/app/views/katello/api/v2/content_facet/base.json.rabl

@@ -14,6 +14,7 @@ child :content_view_environments => :content_view_environments do
       id: cve.content_view&.id,
       name: cve.content_view&.name,
       composite: cve.content_view&.composite,
+      rolling: cve.content_view&.rolling,
       content_view_version: cve.content_view_version&.version,
       content_view_version_id: cve.content_view_version&.id,
       content_view_version_latest: cve.content_view_version&.latest?,
@@ -46,6 +47,7 @@ node :content_view do |content_facet|
       :id => content_view.id,
       :name => content_view.name,
       :composite => content_view.composite?,
+      :rolling => content_view.rolling?,
     }
   end
 end

data/app/views/katello/api/v2/content_view_versions/base.json.rabl

@@ -73,9 +73,21 @@ child :sorted_organization_readable_environments => :environments do
     ::Host.authorized('view_hosts').in_content_view_environment(:content_view => version.content_view, :lifecycle_environment => env).count
   end
 
+  node :multi_env_host_count do |env|
+    hosts = ::Host.authorized('view_hosts')
+      .in_content_view_environments(content_views: [version.content_view], lifecycle_environments: [env])
+    hosts.count { |host| host.content_facet.multi_content_view_environment? }
+  end
+
   node :activation_key_count do |env|
     Katello::ActivationKey.with_content_views(version.content_view).with_environments(env).count
   end
+
+  node :multi_env_ak_count do |env|
+    keys = Katello::ActivationKey.with_content_views(version.content_view)
+      .with_environments(env)
+    keys.count { |key| key.multi_content_view_environment? }
+  end
 end
 
 child :archived_repos => :repositories do

data/app/views/katello/api/v2/content_views/base.json.rabl

@@ -2,6 +2,7 @@ extends 'katello/api/v2/common/identifier'
 extends 'katello/api/v2/common/org_reference'
 
 attributes :composite
+attributes :rolling
 attributes :component_ids, :duplicate_repositories_to_publish
 attributes :default
 attributes :version_count

data/app/views/katello/api/v2/environments/show.json.rabl

@@ -67,4 +67,18 @@ node :content_views do |env|
   end
 end
 
+node :capsules do |env|
+  env.capsules.map do |capsule|
+    {
+      :id => capsule.id,
+      :name => capsule.name,
+      :lifecycle_environments => capsule.capsule_lifecycle_environments.map do |cle|
+        {
+          :id => cle.lifecycle_environment.id,
+        }
+      end,
+    }
+  end
+end
+
 extends 'katello/api/v2/common/timestamps'

data/app/views/katello/api/v2/hosts/base.json.rabl

@@ -13,6 +13,7 @@ if @facet
         :id => content_view.id,
         :name => content_view.name,
         :composite => content_view.composite?,
+        :rolling => content_view.rolling?,
       }
     end
   end

data/app/views/katello/api/v2/organizations/show.json.rabl

@@ -32,10 +32,12 @@ node :default_content_view_id do |org|
 end
 
 node(:composite_content_views_count) { Katello::ContentView.readable&.in_organization(Organization.current)&.composite&.count }
+node(:rolling_content_views_count) { Katello::ContentView.readable&.in_organization(Organization.current)&.rolling&.count }
 node(:content_view_components_count) do
   Katello::ContentView.readable&.
     in_organization(Organization.current)&.
     non_composite&.
+    non_rolling&.
     non_default&.
     ignore_generated&.count
 end

data/app/views/katello/api/v2/repositories/base.json.rabl

@@ -1,6 +1,7 @@
 object @resource
 
 extends 'katello/api/v2/common/identifier'
+extends 'katello/api/v2/common/org_reference'
 
 attributes :pulp_id => :backend_identifier
 attributes :relative_path, :container_repository_name, :full_path, :library_instance_id
@@ -10,7 +11,7 @@ attributes :content_counts
 attributes :mirroring_policy
 
 glue(@object.root) do
-  attributes :content_type, :url, :arch, :os_versions, :content_id, :generic_remote_options
+  attributes :content_type, :url, :docker_upstream_name, :arch, :os_versions, :content_id, :generic_remote_options
   attributes :major, :minor
 
   child :product do |_product|

data/db/migrate/20190930192813_add_pulp3_hrefs_to_content_types.rb

@@ -1,6 +1,6 @@
 class AddPulp3HrefsToContentTypes < ActiveRecord::Migration[5.2]
   def change
-    content_models = [Katello::Rpm, Katello::ModuleStream, Katello::Erratum, Katello::PackageGroup, Katello::YumMetadataFile,
+    content_models = [Katello::Rpm, Katello::ModuleStream, Katello::Erratum, Katello::PackageGroup,
                       Katello::Srpm, Katello::FileUnit, Katello::DockerManifestList, Katello::DockerManifest, Katello::DockerTag]
 
     content_models.each do |model|

data/db/migrate/20241022122325_add_rolling_to_katello_content_views.rb

@@ -0,0 +1,5 @@
+class AddRollingToKatelloContentViews < ActiveRecord::Migration[6.1]
+  def change
+    add_column :katello_content_views, :rolling, :boolean, :default => false
+  end
+end

data/db/migrate/20241025151105_remove_pulp3_migrated_hrefs_from_content_tables.rb

@@ -1,6 +1,6 @@
 class RemovePulp3MigratedHrefsFromContentTables < ActiveRecord::Migration[6.1]
   def change
-    content_models = [Katello::Rpm, Katello::ModuleStream, Katello::Erratum, Katello::PackageGroup, Katello::YumMetadataFile,
+    content_models = [Katello::Rpm, Katello::ModuleStream, Katello::Erratum, Katello::PackageGroup,
                       Katello::Srpm, Katello::FileUnit, Katello::DockerManifestList, Katello::DockerManifest, Katello::DockerTag]
 
     content_models.each do |model|

data/db/migrate/20250215143303_drop_katello_yum_metadata_file.rb

@@ -0,0 +1,5 @@
+class DropKatelloYumMetadataFile < ActiveRecord::Migration[7.0]
+  def change
+    drop_table :katello_yum_metadata_files
+  end
+end

data/db/migrate/20250409120843_fix_file_download_policy.rb

@@ -0,0 +1,11 @@
+class FixFileDownloadPolicy < ActiveRecord::Migration[6.1]
+  def up
+    Katello::RootRepository.where(content_type: "file")
+                           .where(download_policy: [nil, ""])
+                           .update_all(:download_policy => "immediate")
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20250410155300_change_ansible_templates_category.rb

@@ -0,0 +1,22 @@
+class ChangeAnsibleTemplatesCategory < ActiveRecord::Migration[6.1]
+  TEMPLATES = [
+    'Install errata by search query - Katello Ansible Default',
+    'Install packages by search query - Katello Ansible Default',
+    'Remove packages by search query - Katello Ansible Default',
+    'Update packages by search query - Katello Ansible Default',
+  ].freeze
+
+  def up
+    change_category('Katello', 'Katello via Ansible')
+  end
+
+  def down
+    change_category('Katello via Ansible', 'Katello')
+  end
+
+  private
+
+  def change_category(from, to)
+    ::Template.where(type: 'JobTemplate', provider_type: 'Ansible', job_category: from, name: TEMPLATES).update_all(job_category: to)
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot

@@ -1113,6 +1113,7 @@ msgstr ""
 msgid "Complete Sync"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
 #: app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html
 msgid "Completed {{ repository.last_sync_words }} ago"
 msgstr ""
@@ -3118,6 +3119,9 @@ msgid "Please make sure a Content View is selected."
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/activation-keys/new/views/activation-key-new.html
+msgid "Please select a lifecycle environment. Lifecycle environment and content view must be provided together."
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-environment-modal.html
 msgid "Please select an environment."
 msgstr ""