[PR] Fixes #36765 - add ability to export and import debian content

from Katello#10749
ATIX-AG · Mar 4, 2024 · 20f0ebc · 20f0ebc
1 parent 0cd695c
commit 20f0ebc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/app/models/katello/repository.rb b/app/models/katello/repository.rb
@@ -30,7 +30,7 @@ class Repository < Katello::Model
     ANSIBLE_COLLECTION_TYPE = 'ansible_collection'.freeze
     GENERIC_TYPE = 'generic'.freeze
 
-    EXPORTABLE_TYPES = [YUM_TYPE, FILE_TYPE, ANSIBLE_COLLECTION_TYPE, DOCKER_TYPE].freeze
+    EXPORTABLE_TYPES = [YUM_TYPE, FILE_TYPE, ANSIBLE_COLLECTION_TYPE, DOCKER_TYPE, DEB_TYPE].freeze
 
     define_model_callbacks :sync, :only => :after
 

diff --git a/app/services/katello/pulp3/content_view_version/metadata_generator.rb b/app/services/katello/pulp3/content_view_version/metadata_generator.rb
@@ -45,6 +45,7 @@ def generate!
         def generate_repository_metadata(repo)
           repo.slice(:name, :label, :description, :arch, :content_type, :unprotected,
                      :checksum_type, :os_versions, :major, :minor,
+                     :deb_releases, :deb_components, :deb_architectures,
                      :download_policy, :mirroring_policy).
             merge(product: generate_product_metadata(repo.product),
                   gpg_key: generate_gpg_metadata(repo.gpg_key),

diff --git a/app/services/katello/pulp3/content_view_version/metadata_map.rb b/app/services/katello/pulp3/content_view_version/metadata_map.rb
@@ -102,6 +102,9 @@ def parse_repositories(repositories)
               download_policy: repo[:download_policy],
               mirroring_policy: repo[:mirroring_policy],
               redhat: repo[:redhat],
+              deb_releases: repo[:deb_releases],
+              deb_components: repo[:deb_components],
+              deb_architectures: repo[:deb_architectures],
               product: product_for_repo(repo),
               gpg_key: gpg_key_for_repo(repo),
               content: content

diff --git a/test/services/katello/pulp3/content_view_version/export_test.rb b/test/services/katello/pulp3/content_view_version/export_test.rb
@@ -211,7 +211,7 @@ class ExportTest < ActiveSupport::TestCase
             assert_includes export.repositories(fetch_all: true).all.map(&:content_type), 'ansible_collection'
             assert_includes export.repositories(fetch_all: true).all.map(&:content_type), 'file'
             assert_includes export.repositories(fetch_all: true).all.map(&:content_type), 'yum'
-            refute_includes export.repositories(fetch_all: true).all.map(&:content_type), 'deb'
+            assert_includes export.repositories(fetch_all: true).all.map(&:content_type), 'deb'
           end
 
           it "Generates Exporter path correctly" do