katello 4.3.0 → 4.4.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/packages.controller.js

@@ -21,6 +21,7 @@ angular.module('Bastion.packages').controller('PackagesController',
         var nutupane, params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
+            'repository_id': $location.search().repositoryId || null,
             'paged': true
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js

@@ -108,20 +108,27 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
 
                 if ($scope.genericRemoteOptions && $scope.genericRemoteOptions !== []) {
                     $scope.genericRemoteOptions.forEach(function(option) {
-                       if (option.type === "Array" && option.value) {
-                           repository[option.name] = option.value.split(option.delimiter);
+                       if (option.type === "Array") {
+                           repository[option.name] = option.value ? option.value.split(option.delimiter) : [];
                        } else {
                            repository[option.name] = option.value;
                        }
                    });
                 }
 
-                if (!_.isEmpty(repository.commaTagsWhitelist)) {
-                    repository["docker_tags_whitelist"] = repository.commaTagsWhitelist.split(",").map(function(tag) {
+                if (!_.isEmpty(repository.commaIncludeTags)) {
+                    repository["include_tags"] = repository.commaIncludeTags.split(",").map(function(tag) {
                         return tag.trim();
                     });
                 } else {
-                    repository["docker_tags_whitelist"] = [];
+                    repository["include_tags"] = [];
+                }
+                if (!_.isEmpty(repository.commaExcludeTags)) {
+                    repository["exclude_tags"] = repository.commaExcludeTags.split(",").map(function(tag) {
+                        return tag.trim();
+                    });
+                } else {
+                    repository["exclude_tags"] = [];
                 }
                 /* eslint-disable camelcase */
 
@@ -134,10 +141,15 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 repository.$update(function (response) {
                     deferred.resolve(response);
                     $scope.repository.ignore_srpms = $scope.repository.ignorable_content && $scope.repository.ignorable_content.includes("srpm");
-                    if (!_.isEmpty(response["docker_tags_whitelist"])) {
-                        repository.commaTagsWhitelist = repository["docker_tags_whitelist"].join(", ");
+                    if (!_.isEmpty(response["include_tags"])) {
+                        repository.commaIncludeTags = repository["include_tags"].join(", ");
+                    } else {
+                        repository.commaIncludeTags = null;
+                    }
+                    if (!_.isEmpty(response["exclude_tags"])) {
+                        repository.commaExcludeTags = repository["exclude_tags"].join(", ");
                     } else {
-                        repository.commaTagsWhitelist = null;
+                        repository.commaExcludeTags = null;
                     }
                     Notification.setSuccessMessage(translate('Repository Saved.'));
                 }, function (response) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-manage-content.controller.js

@@ -13,7 +13,6 @@
  * @requires DockerManifest
  * @requires DockerManifestList
  * @requires DockerTag
- * @requires OstreeBranch
  * @requires File
  * @requires Deb
  * @requires ModuleStream
@@ -25,8 +24,8 @@
  *   Provides the functionality for the repository details pane.
  */
 angular.module('Bastion.repositories').controller('RepositoryManageContentController',
-    ['$scope', '$state', 'translate', 'Notification', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'DockerManifest', 'DockerManifestList', 'DockerTag', 'OstreeBranch', 'File', 'Deb', 'ModuleStream', 'AnsibleCollection', 'GenericContent', 'RepositoryTypesService',
-    function ($scope, $state, translate, Notification, Nutupane, Repository, Package, PackageGroup, DockerManifest, DockerManifestList, DockerTag, OstreeBranch, File, Deb, ModuleStream, AnsibleCollection, GenericContent, RepositoryTypesService) {
+    ['$scope', '$state', 'translate', 'Notification', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'DockerManifest', 'DockerManifestList', 'DockerTag', 'File', 'Deb', 'ModuleStream', 'AnsibleCollection', 'GenericContent', 'RepositoryTypesService',
+    function ($scope, $state, translate, Notification, Nutupane, Repository, Package, PackageGroup, DockerManifest, DockerManifestList, DockerTag, File, Deb, ModuleStream, AnsibleCollection, GenericContent, RepositoryTypesService) {
         var contentTypes, nutupaneParams;
 
         function success(response, selected) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details.controller.js

@@ -53,10 +53,15 @@
             'product_id': $scope.$stateParams.productId,
             'id': $scope.$stateParams.repositoryId
         }, function () {
-            if (!_.isEmpty($scope.repository["docker_tags_whitelist"])) {
-                $scope.repository.commaTagsWhitelist = $scope.repository["docker_tags_whitelist"].join(", ");
+            if (!_.isEmpty($scope.repository["include_tags"])) {
+                $scope.repository.commaIncludeTags = $scope.repository["include_tags"].join(", ");
             } else {
-                $scope.repository.commaTagsWhitelist = "";
+                $scope.repository.commaIncludeTags = "";
+            }
+            if (!_.isEmpty($scope.repository["exclude_tags"])) {
+                $scope.repository.commaExcludeTags = $scope.repository["exclude_tags"].join(", ");
+            } else {
+                $scope.repository.commaExcludeTags = "";
             }
             $scope.page.loading = false;
             $scope.repositoryWrapper.repository = $scope.repository;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -28,31 +28,37 @@
     </dl>
 
     <div class="divider"></div>
+
+    <div ng-show="repository.content_type === 'yum'" >
+      <h4 translate>Publishing Settings</h4>
+
+      <dl class="dl-horizontal dl-horizontal-left">
+          <dt>
+            <span translate>Restrict to architecture</span>
+            <i class="pficon-info" title="{{ 'The repository will be enabled by default on content hosts with the selected architecture.' | translate }}"></i>
+          </dt>
+          <dd bst-edit-select="repository.arch==='noarch'?'No restriction':repository.arch"
+              selector="repository.arch"
+              options="architectures()"
+              on-save="save(repository)">
+          </dd>
+
+          <dt>
+            <span translate>Restrict to <br />OS version</span>
+            <i class="pficon-info" title="{{ 'The repository will be enabled by default on content hosts with the selected OS version.' | translate }}"></i>
+          </dt>
+          <dd bst-edit-select="repository.os_versions.length ? formatOSVersions() : 'No restriction'"
+              selector="selectedOSVersion"
+              options="osVersionsOptions()"
+              on-save="save(repository)">
+          </dd>
+      </dl>
+      <div class="divider"></div>
+    </div>
+
     <h4 translate>Sync Settings</h4>
-    <dl class="dl-horizontal dl-horizontal-left">
-      <span ng-show="repository.content_type === 'yum'" >
-        <dt>
-          <span translate>Restrict to architecture</span>
-          <i class="pficon-info" title="{{ 'The repository will be enabled by default on content hosts with the selected architecture.' | translate }}"></i>
-        </dt>
-        <dd bst-edit-select="repository.arch==='noarch'?'No restriction':repository.arch"
-            selector="repository.arch"
-            options="architectures()"
-            on-save="save(repository)">
-        </dd>
-      </span>
 
-      <span ng-show="repository.content_type === 'yum'" >
-        <dt>
-          <span translate>Restrict to <br />OS version</span>
-          <i class="pficon-info" title="{{ 'The repository will be enabled by default on content hosts with the selected OS version.' | translate }}"></i>
-        </dt>
-        <dd bst-edit-select="repository.os_versions.length ? formatOSVersions() : 'No restriction'"
-            selector="selectedOSVersion"
-            options="osVersionsOptions()"
-            on-save="save(repository)">
-        </dd>
-      </span>
+    <dl class="dl-horizontal dl-horizontal-left">
 
       <dt ng-show="repository.content_type !== 'docker'" translate>Upstream URL</dt>
       <dt ng-show="repository.content_type === 'docker'" translate>Registry URL</dt>
@@ -304,7 +310,7 @@
           options="certs()"
           on-save="save(repository)">
       </dd>
-      <span ng-if="repository.content_type == 'yum' || repository.content_type == 'deb'">
+      <span ng-if="repository.content_type == 'yum' || repository.content_type == 'deb' || repository.content_type == 'docker'">
         <dt translate>Download Policy</dt>
         <dd bst-edit-select="downloadPolicyDisplay(repository.download_policy)"
             readonly="denied('edit_products', product)"
@@ -326,15 +332,13 @@
         </dd>
       </span>
       <span ng-if="repository.content_type == 'docker'">
-        <dt translate>Limit Sync Tags</dt>
-        <dd bst-edit-text="repository.commaTagsWhitelist"
+        <dt translate>Include Tags</dt>
+        <dd bst-edit-text="repository.commaIncludeTags"
             on-save="save(repository)"
             readonly="denied('edit_products', product)">
         </dd>
-      </span>
-      <span ng-if="repository.content_type == 'docker'">
-        <dt translate>Limit Sync Tags</dt>
-        <dd bst-edit-text="repository.commaTagsWhitelist"
+        <dt translate>Exclude Tags</dt>
+        <dd bst-edit-text="repository.commaExcludeTags"
             on-save="save(repository)"
             readonly="denied('edit_products', product)">
         </dd>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js

@@ -64,7 +64,7 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             $scope.repository = new Repository({'product_id': $scope.$stateParams.productId, unprotected: true,
                 'checksum_type': null, 'verify_ssl_on_sync': true,
                 'download_policy': BastionConfig.defaultDownloadPolicy, 'arch': null,
-                'mirroring_policy': MirroringPolicy.defaultMirroringPolicy});
+                'mirroring_policy': MirroringPolicy.defaultMirroringPolicy, 'include_tags': '', 'exclude_tags': '*-source'});
 
             $scope.product = Product.get({id: $scope.$stateParams.productId}, function () {
                 $scope.page.loading = false;
@@ -138,7 +138,7 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
                         repository.ignorable_content = [];
                     }
                 }
-                if (repository.content_type !== 'yum' && repository.content_type !== 'deb' ) {
+                if (repository.content_type !== 'yum' && repository.content_type !== 'deb' && repository.content_type !== 'docker') {
                     repository['download_policy'] = '';
                 }
                 if (repository.arch === 'No restriction') {
@@ -160,6 +160,20 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
                         }
                     });
                 }
+                if (!_.isEmpty(repository.include_tags)) {
+                    repository["include_tags"] = repository.include_tags.split(",").map(function(tag) {
+                        return tag.trim();
+                    });
+                } else {
+                    repository["include_tags"] = [];
+                }
+                if (!_.isEmpty(repository.exclude_tags)) {
+                    repository["exclude_tags"] = repository.exclude_tags.split(",").map(function(tag) {
+                        return tag.trim();
+                    });
+                } else {
+                    repository["exclude_tags"] = [];
+                }
                 repository.$save(success, error);
             };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html

@@ -39,29 +39,33 @@
         </select>
       </div>
 
-      <div bst-form-group label="{{ 'Restrict to Architecture' | translate }}" ng-show="repository.content_type === 'yum'">
+    </div>
+
+    <div ng-show="repository.content_type === 'yum'">
+      <h4 translate> Publishing Settings </h4>
+      <div bst-form-group label="{{ 'Restrict to Architecture' | translate }}">
         <select id="architecture_restricted"
                 name="architecture_restricted"
                 ng-model="repository.arch"
                 ng-options="arch.id as arch.name for arch in architecture">
         </select>
+        <p class="help-block" translate>
+          The repository will be enabled by default on content hosts with the selected architecture.
+        </p>
       </div>
 
-      <div
-        bst-form-group label="{{ 'Restrict to OS version' | translate }}"
-        ng-if="repository.content_type === 'yum'"
-      >
-       <select id="os_versions"
-               name="os_versions"
-               ng-model="repository.os_versions"
-               ng-options="tag as tag.name for tag in osVersionsOptions track by tag.id">
-       </select>
-       <p class="help-block" translate>
-         The repository will be enabled by default on content hosts with the selected OS version.
-       </p>
+      <div bst-form-group label="{{ 'Restrict to OS version' | translate }}">
+        <select id="os_versions"
+                name="os_versions"
+                ng-model="repository.os_versions"
+                ng-options="tag as tag.name for tag in osVersionsOptions track by tag.id">
+        </select>
+        <p class="help-block" translate>
+          The repository will be enabled by default on content hosts with the selected OS version.
+        </p>
       </div>
-
     </div>
+
     <div ng-show="repository.content_type !== undefined">
       <h4 translate> Sync Settings </h4>
       <div bst-form-group label="{{ 'Upstream URL' | translate }} ">
@@ -259,7 +263,7 @@
         </div>
       </div>
 
-      <div bst-form-group label="{{ 'Download Policy' | translate }}" ng-if="repository.content_type === 'yum' || repository.content_type === 'deb'">
+      <div bst-form-group label="{{ 'Download Policy' | translate }}" ng-if="repository.content_type === 'yum' || repository.content_type === 'deb' || repository.content_type === 'docker'">
         <select id="download_policy"
                 name="download_policy"
                 ng-model="repository.download_policy"
@@ -288,6 +292,22 @@
         </p>
       </div>
 
+      <div bst-form-group label="{{ 'Include Tags' | translate }}" ng-if="(repository.content_type === 'docker')">
+        <input id="include_tags" name="include_tags" ng-model="repository.include_tags" type="text"/>
+
+        <p class="help-block">
+          <span translate>A comma-separated list of container image tags to include when syncing.</span><br />
+        </p>
+      </div>
+
+      <div bst-form-group label="{{ 'Exclude Tags' | translate }}" ng-if="(repository.content_type === 'docker')">
+        <input id="exclude_tags" name="exclude_tags" ng-model="repository.exclude_tags" type="text"/>
+
+        <p class="help-block">
+          <span translate>A comma-separated list of container image tags to exclude when syncing. Source images are excluded by default because they are often large and unwanted.</span><br />
+        </p>
+      </div>
+
       <div bst-form-group label="{{ 'Retain package versions' | translate }}" ng-if="(repository.content_type === 'yum' && repository.mirroring_policy === 'additive')">
         <input id="retain_package_versions_count" name="retain_package_versions_count" ng-model="repository.retain_package_versions_count" type="number"/>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery.controller.js

@@ -4,8 +4,6 @@
  *
  * @requires $scope
  * @requires $q
- * @requires $timeout
- * @requires $http
  * @requires Notification
  * @requires Task
  * @requires Organization
@@ -18,8 +16,8 @@
  *   Provides the functionality for the repo discovery action pane.
  */
 angular.module('Bastion.products').controller('DiscoveryController',
-    ['$scope', '$q', '$timeout', '$http', '$filter', 'Notification', 'Task', 'Organization', 'CurrentOrganization', 'DiscoveryRepositories', 'ContainerRegistries', 'translate',
-    function ($scope, $q, $timeout, $http, $filter, Notification, Task, Organization, CurrentOrganization, DiscoveryRepositories, ContainerRegistries, translate) {
+    ['$scope', '$q', '$filter', 'Notification', 'Task', 'Organization', 'CurrentOrganization', 'DiscoveryRepositories', 'ContainerRegistries', 'translate',
+    function ($scope, $q, $filter, Notification, Task, Organization, CurrentOrganization, DiscoveryRepositories, ContainerRegistries, translate) {
         var transformRows, setDiscoveryDetails;
 
         $scope.discovery = {
@@ -37,6 +35,9 @@ angular.module('Bastion.products').controller('DiscoveryController',
             {id: "docker", name: "Container Images"}
         ];
         $scope.hideSwitcher = true;
+
+        // scope.table may have been set when clicking in from products
+        // otherwise set a simple table since there is no BastionResource here
         if (!$scope.table) {
             $scope.table = {
                 rows: [],

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/products.routes.js

@@ -42,13 +42,14 @@ angular.module('Bastion.products').config(['$stateProvider', function ($statePro
     });
 
     $stateProvider.state("product-discovery", {
-        abstract: true,
         url: '/products/discovery',
-        controller: 'DiscoveryController',
-        templateUrl: 'products/discovery/views/discovery-base.html'
+        templateUrl: 'products/discovery/views/discovery-base.html',
+        permission: 'edit_products',
+        redirectTo: 'product-discovery.scan'
     })
     .state("product-discovery.scan", {
         url: '/scan',
+        controller: 'DiscoveryController',
         permission: 'edit_products',
         templateUrl: 'products/discovery/views/discovery.html',
         ncyBreadcrumb: {

data/lib/katello/engine.rb

@@ -226,6 +226,10 @@ module Katello
       ::AuditSearch::ClassMethods.prepend Katello::Concerns::AuditSearch
       ::Widget.singleton_class.prepend Katello::Concerns::WidgetExtensions::ClassMethods
 
+      if ::Katello.with_remote_execution?
+        ::RemoteExecutionProxySelector.prepend Katello::Concerns::RemoteExecutionProxySelectorExtensions
+      end
+
       load 'katello/repository_types.rb'
       load 'katello/scheduled_jobs.rb'
 

data/lib/katello/permission_creator.rb

@@ -124,7 +124,7 @@ module Katello
                          :finder_scope => :editable
       @plugin.permission :destroy_content_views,
                          {
-                           'katello/api/v2/content_views' => [:destroy, :remove],
+                           'katello/api/v2/content_views' => [:destroy, :remove, :bulk_delete_versions],
                            'katello/api/v2/content_view_versions' => [:destroy]
                          },
                          :resource_type => 'Katello::ContentView',

data/lib/katello/permissions/host_permissions.rb

@@ -29,6 +29,7 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/v2/hosts_bulk_actions/traces',
   'katello/api/v2/hosts_bulk_actions/resolve_traces',
   'katello/api/v2/hosts_bulk_actions/system_purpose',
+  'katello/api/v2/hosts_bulk_actions/change_content_source',
   'katello/api/rhsm/candlepin_dynflow_proxy/upload_package_profile',
   'katello/api/rhsm/candlepin_dynflow_proxy/upload_profiles',
   'katello/api/rhsm/candlepin_dynflow_proxy/deb_package_profile',
@@ -36,7 +37,8 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/rhsm/candlepin_proxies/hypervisors_update',
   'katello/api/rhsm/candlepin_proxies/async_hypervisors_update',
   'katello/api/rhsm/candlepin_proxies/hypervisors_heartbeat',
-  'katello/api/rhsm/candlepin_proxies/upload_tracer_profile'
+  'katello/api/rhsm/candlepin_proxies/upload_tracer_profile',
+  'hosts/change_content_source_data'
 ]
 
 Foreman::AccessControl.permission(:view_hosts).actions.concat [

data/lib/katello/plugin.rb

@@ -299,16 +299,19 @@ Foreman::Plugin.register :katello do
 
   describe_host do
     overview_buttons_provider :content_host_overview_button
+    multiple_actions_provider :hosts_change_content_source
   end
 
   if Katello.with_remote_execution?
     RemoteExecutionFeature.register(:katello_package_install, N_("Katello: Install Package"), :description => N_("Install package via Katello interface"), :provided_inputs => ['package'])
+    RemoteExecutionFeature.register(:katello_package_install_by_search, N_("Katello: Install packages by search query"), :description => N_("Install packages via Katello interface"), :provided_inputs => ['Package search query'])
     RemoteExecutionFeature.register(:katello_package_update, N_("Katello: Update Package"), :description => N_("Update package via Katello interface"), :provided_inputs => ['package'])
     RemoteExecutionFeature.register(:katello_package_remove, N_("Katello: Remove Package"), :description => N_("Remove package via Katello interface"), :provided_inputs => ['package'])
     RemoteExecutionFeature.register(:katello_group_install, N_("Katello: Install Package Group"), :description => N_("Install package group via Katello interface"), :provided_inputs => ['package'])
     RemoteExecutionFeature.register(:katello_group_update, N_("Katello: Update Package Group"), :description => N_("Update package group via Katello interface"), :provided_inputs => ['package'])
     RemoteExecutionFeature.register(:katello_group_remove, N_("Katello: Remove Package Group"), :description => N_("Remove package group via Katello interface"), :provided_inputs => ['package'])
     RemoteExecutionFeature.register(:katello_errata_install, N_("Katello: Install Errata"), :description => N_("Install errata via Katello interface"), :provided_inputs => ['errata'])
+    RemoteExecutionFeature.register(:katello_errata_install_by_search, N_("Katello: Install errata by search query"), :description => N_("Install errata using scoped search query"), :provided_inputs => ['Errata search query'])
     RemoteExecutionFeature.register(:katello_service_restart, N_("Katello: Service Restart"), :description => N_("Restart Services via Katello interface"), :provided_inputs => ['helpers'])
     RemoteExecutionFeature.register(:katello_host_tracer_resolve, N_("Katello: Resolve Traces"), :description => N_("Resolve traces via Katello interface"), :provided_inputs => ['ids'])
     RemoteExecutionFeature.register(:katello_module_stream_action, N_("Katello: Module Stream Actions"),
@@ -339,7 +342,7 @@ Foreman::Plugin.register :katello do
 
   register_info_provider Katello::Host::InfoProvider
 
-  medium_providers.register(Katello::ManagedContentMediumProvider)
+  medium_providers_registry.register(Katello::ManagedContentMediumProvider)
 
   Katello::PermissionCreator.new(self).define
   add_all_permissions_to_default_roles

data/lib/katello/repository_types/deb.rb

@@ -20,7 +20,6 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DEB_TYPE) do
 
   default_managed_content_type Katello::Deb::CONTENT_TYPE
   content_type Katello::Deb,
-    :pulp2_service_class => ::Katello::Pulp::Deb,
     :pulp3_service_class => ::Katello::Pulp3::Deb,
     :removable => true,
     :uploadable => true

data/lib/katello/repository_types/docker.rb

@@ -19,24 +19,24 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
   distribution_class PulpContainerClient::ContainerContainerDistribution
   repo_sync_url_class PulpContainerClient::RepositorySyncURL
 
+  index_additional_data do |repo|
+    Katello::DockerMetaTag.import_meta_tags([repo])
+  end
+
   content_type Katello::DockerManifest,
                :priority => 1,
-               :pulp2_service_class => ::Katello::Pulp::DockerManifest,
                :pulp3_service_class => ::Katello::Pulp3::DockerManifest,
                :removable => true,
                :uploadable => true
   content_type Katello::DockerManifestList,
                :priority => 2,
-               :pulp2_service_class => ::Katello::Pulp::DockerManifestList,
                :pulp3_service_class => ::Katello::Pulp3::DockerManifestList
   content_type Katello::DockerTag,
                :priority => 3,
-               :pulp2_service_class => ::Katello::Pulp::DockerTag,
                :pulp3_service_class => ::Katello::Pulp3::DockerTag,
                :primary_content => true
   content_type Katello::DockerBlob,
                :priority => 4,
-               :pulp2_service_class => ::Katello::Pulp::DockerBlob,
                :pulp3_service_class => ::Katello::Pulp3::DockerBlob,
                :index => false
 end

data/lib/katello/repository_types/file.rb

@@ -19,7 +19,6 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::FILE_TYPE) do
   repo_sync_url_class PulpFileClient::RepositorySyncURL
 
   content_type Katello::FileUnit,
-               :pulp2_service_class => ::Katello::Pulp::FileUnit,
                :pulp3_service_class => ::Katello::Pulp3::FileUnit,
                :removable => true,
                :uploadable => true

data/lib/katello/repository_types/ostree.rb

@@ -21,12 +21,14 @@ Katello::RepositoryTypeManager.register('ostree') do
   url_description N_("URL of an OSTree repository.")
 
   generic_content_type 'ostree_ref',
+                       pluralized_name: "OSTree Refs",
                        model_class: Katello::GenericContentUnit,
                        pulp3_api: PulpOstreeClient::ContentRefsApi,
                        pulp3_service_class: Katello::Pulp3::GenericContentUnit,
                        model_name: lambda { |pulp_unit| pulp_unit["name"] },
                        model_version: lambda { |pulp_unit| pulp_unit["checksum"] },
                        uploadable: true,
+                       generic_browser: true,
                        repository_import_on_upload: true
 
   import_attribute :ref, :content_type => 'ostree_ref',
@@ -48,4 +50,6 @@ Katello::RepositoryTypeManager.register('ostree') do
                         :required => true
 
   default_managed_content_type :ostree_ref
+
+  test_url 'https://fixtures.pulpproject.org/ostree/small/'
 end

data/lib/katello/repository_types/python.rb

@@ -49,6 +49,10 @@ Katello::RepositoryTypeManager.register('python') do
                        uploadable: true,
                        duplicates_allowed: false,
                        filename_key: :filename,
-                       generic_browser: true
+                       generic_browser: true,
+                       test_upload_path: 'test/fixtures/files/shelf_reader-0.1-py2-none-any.whl'
   default_managed_content_type :python_package
+
+  test_url 'https://fixtures.pulpproject.org/python-pypi/'
+  test_url_root_options generic_remote_options: {includes: ['celery']}.to_json
 end

data/lib/katello/repository_types/yum.rb

@@ -21,35 +21,28 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
   default_managed_content_type Katello::Rpm::CONTENT_TYPE
   content_type Katello::Rpm,
     :priority => 1,
-    :pulp2_service_class => ::Katello::Pulp::Rpm,
     :pulp3_service_class => ::Katello::Pulp3::Rpm,
     :primary_content => true,
     :removable => true,
     :uploadable => true
   content_type Katello::ModuleStream,
     :priority => 2,
-    :pulp2_service_class => ::Katello::Pulp::ModuleStream,
     :pulp3_service_class => ::Katello::Pulp3::ModuleStream
   content_type Katello::Erratum, :priority => 3,
-    :pulp2_service_class => ::Katello::Pulp::Erratum,
     :pulp3_service_class => ::Katello::Pulp3::Erratum,
-    :primary_content => true
+    :primary_content => true, :mutable => true
   content_type Katello::PackageGroup,
-    :pulp2_service_class => ::Katello::Pulp::PackageGroup,
     :pulp3_service_class => ::Katello::Pulp3::PackageGroup
   content_type Katello::YumMetadataFile,
-    :pulp2_service_class => ::Katello::Pulp::YumMetadataFile,
     :pulp3_service_class => ::Katello::Pulp3::YumMetadataFile,
     :index_on_pulp3 => false
   content_type Katello::Srpm,
-    :pulp2_service_class => ::Katello::Pulp::Srpm,
     :pulp3_service_class => ::Katello::Pulp3::Srpm,
     :removable => true, :uploadable => true
   content_type Katello::Distribution, :priority => 4,
-    :pulp2_service_class => ::Katello::Pulp::Distribution,
     :pulp3_service_class => ::Katello::Pulp3::Distribution,
     :index => false
-  content_type Katello::PackageCategory, :priority => 4, :pulp2_service_class => ::Katello::Pulp::PackageCategory, :index => false
+  content_type Katello::PackageCategory, :priority => 4, :index => false
 
   index_additional_data { |repo, target_repo = nil| repo.import_distribution_data(target_repo) }
 end

data/lib/katello/tasks/content_view_import_only.rake

@@ -0,0 +1,34 @@
+namespace :katello do
+  desc <<-DESCRIPTION
+  Marks a content view import only or otherwise. Only 'import_only' Content Views can import content via import/export process.
+  Options:
+    ID - ID of the content view that will be marked import
+    VALUE - If true the provided content view will be marked as import_only. This is the default.
+            If false the import_only flag of provided content view will be reset.
+  DESCRIPTION
+
+  task :set_content_view_import_only => ["environment"] do
+    def fetch_content_view
+      if ENV['ID'].blank?
+        fail 'Content view `ID` required.'
+      end
+      ::Katello::ContentView.find_by(id: ENV['ID'])
+    end
+
+    def mark_import_only(value: true)
+      User.current = User.anonymous_admin
+      content_view = fetch_content_view
+      fail('Composite content views cannot be marked import_only. Check the content view id.') if content_view.composite?
+      fail('Default Organization View cannot be marked import_only. Check the content view id.') if content_view.default?
+      content_view.import_only = value
+      if content_view.save(validate: false)
+        $stdout.print("Content View '#{content_view.name}'s import_only value updated to #{content_view.import_only} ")
+      else
+        $stderr.print("Unable to set the content view import_only to #{value}. Check the content view id.")
+        $stderr.print(content_view.errors.inspect)
+      end
+    end
+    value = ENV['VALUE'].blank? || ::Foreman::Cast.to_bool(ENV['VALUE'])
+    mark_import_only(value: value)
+  end
+end

data/lib/katello/tasks/import_applicability.rake

@@ -1,7 +1,7 @@
 namespace :katello do
   task :import_applicability => ["environment"] do
     Katello::Host::ContentFacet.find_each do |facet|
-      facet.import_applicability
+      facet.calculate_and_import_applicability
     rescue StandardError => exception
       puts _('Error importing applicability for %{name} - %{id}: %{message}') %
           {:name => facet.host.name, :id => facet.host.id, :message => exception.message}

data/lib/katello/tasks/jenkins.rake

@@ -2,8 +2,6 @@ require File.expand_path("../engine", File.dirname(__FILE__))
 
 begin
   namespace :jenkins do
-    ENV['USE_MEAN_TIME_REPORTER'] = '1' unless ENV['USE_MEAN_TIME_REPORTER'] == '0'
-
     task :katello do
       Rake::Task['jenkins:setup:minitest'].invoke
       Rake::Task['rake:test:katello'].invoke

data/lib/katello/tasks/repository.rake

@@ -119,7 +119,10 @@ namespace :katello do
     puts "Repository #{repo.id} Missing"
     if repo.content_view.default?
       puts "Recreating #{repo.id}"
-      ForemanTasks.sync_task(::Actions::Katello::Repository::Create, repo, force_repo_create: true) if commit?
+      if commit?
+        ForemanTasks.sync_task(::Actions::Katello::Repository::Create, repo, force_repo_create: true)
+        repo.reload.index_content
+      end
     else
       puts "Deleting #{repo.id}"
       ForemanTasks.sync_task(::Actions::Katello::Repository::Destroy, repo) if commit?