katello 3.16.0.rc5.1 → 3.16.0

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

@@ -0,0 +1,100 @@
+module Katello
+  module Pulp3
+    class Task
+      # A call report Looks like:  {"task":"/pulp/api/v3/tasks/5/"}
+      # {
+      #    "pulp_href":"/pulp/api/v3/tasks/4/",
+      #    "pulp_created":"2019-02-21T19:50:40.476767Z",
+      #    "job_id":"d0359658-d926-47a2-b430-1b2092b3bd86",
+      #    "state":"completed",
+      #    "name":"pulp_file.app.tasks.publishing.publish",
+      #    "started_at":"2019-02-21T19:50:40.556002Z",
+      #    "finished_at":"2019-02-21T19:50:40.618397Z",
+      #    "non_fatal_errors":[
+      #
+      #    ],
+      #    "error":null,
+      #    "worker":"/pulp/api/v3/workers/1/",
+      #    "parent":null,
+      #    "spawned_tasks":[
+      #
+      #    ],
+      #    "progress_reports":[
+      #
+      #    ],
+      #    "created_resources":[
+      #       "/pulp/api/v3/publications/1/"
+      #    ]
+      # }
+
+      WAITING = 'waiting'.freeze
+      SKIPPED = 'skipped'.freeze
+      RUNNING = 'running'.freeze
+      COMPLETED = 'completed'.freeze
+      FAILED = 'failed'.freeze
+      CANCELED = 'canceled'.freeze
+
+      FINISHED_STATES = [COMPLETED, FAILED, CANCELED, SKIPPED].freeze
+
+      #needed for serialization in dynflow
+
+      delegate :[], :key?, :dig, :to_hash, :to => :task_data
+
+      def initialize(smart_proxy, data)
+        @smart_proxy = smart_proxy
+        if (href = data['task'])
+          @href = href
+        else
+          @pulp_data = data.with_indifferent_access
+          @href = @pulp_data['pulp_href']
+          Rails.logger.error("Got empty pulp_href on #{@pulp_data}") if @href.nil?
+        end
+      end
+
+      def task_data(force_refresh = false)
+        @pulp_data = nil if force_refresh
+        @pulp_data ||= tasks_api.read(@href).as_json.with_indifferent_access
+      end
+
+      def tasks_api
+        ::Katello::Pulp3::Api::Core.new(@smart_proxy).tasks_api
+      end
+
+      def task_group_href
+        task_data[:task_group]
+      end
+
+      def done?
+        task_data[:finish_time] || FINISHED_STATES.include?(task_data[:state])
+      end
+
+      def poll
+        task_data(true)
+        self
+      end
+
+      def started?
+        task_data[:start_time]
+      end
+
+      def error
+        if task_data[:state] == CANCELED
+          self.new(_("Task canceled"))
+        elsif task_data[:state] == FAILED
+          if task_data[:error][:description].blank?
+            _("Pulp task error")
+          else
+            task_data[:error][:description]
+          end
+        end
+      end
+
+      def cancel
+        data = PulpcoreClient::Task.new(state: 'canceled')
+        tasks_api.tasks_cancel(pulp_task['pulp_href'], data)
+        #the main task may have completed, so cancel spawned tasks too
+        task_data['spawned_tasks']&.each { |spawned| tasks_api.tasks_cancel(spawned['pulp_href'], data) }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,79 @@
+module Katello
+  module Pulp3
+    class TaskGroup
+      WAITING = 'waiting'.freeze
+      SKIPPED = 'skipped'.freeze
+      RUNNING = 'running'.freeze
+      COMPLETED = 'completed'.freeze
+      CANCELLED = 'canceled'.freeze
+      FAILED = 'failed'.freeze
+
+      IN_PROGRESS_STATES = [WAITING, RUNNING].freeze
+
+      #needed for serialization in dynflow
+      delegate :to_hash, :to => :task_group_data
+      delegate :dig, :to => :task_group_data
+
+      attr_accessor :href
+
+      # A call report Looks like:  {"task":"/pulp/api/v3/tasks/5/"}
+      #{
+      # "pulp_href":"/pulp/api/v3/task-groups/d9841aaa-8a47-4e31-9018-10e4430766bf/",
+      #     "description":"Migration Sub-tasks",
+      #     "waiting":0,
+      #     "skipped":0,
+      #     "running":0,
+      #     "completed":0,
+      #     "canceled":0,
+      #     "failed":1
+      # }
+
+      def self.new_from_href(smart_proxy, href)
+        group = self.new(smart_proxy, {'pulp_href' => href})
+        group.clear_task_group_data
+        group
+      end
+
+      def initialize(smart_proxy, data)
+        @smart_proxy = smart_proxy
+        @pulp_data = data.with_indifferent_access
+        @href = @pulp_data['pulp_href']
+        Rails.logger.error("Got empty pulp_href on #{@pulp_data}") if @href.nil?
+      end
+
+      def task_group_data
+        @pulp_data ||= tasks_groups_api.read(@href).as_json.with_indifferent_access
+      end
+
+      def tasks_groups_api
+        ::Katello::Pulp3::Api::Core.new(@smart_proxy).task_groups_api
+      end
+
+      def done?
+        task_group_data['all_tasks_dispatched'] = true && IN_PROGRESS_STATES.all? { |state| task_group_data[state] == 0 }
+      end
+
+      def poll
+        clear_task_group_data
+        task_group_data
+      end
+
+      def clear_task_group_data
+        @pulp_data = nil
+      end
+
+      def started?
+        [SKIPPED, RUNNING, COMPLETED, CANCELLED, FAILED].any? { |state| task_group_data[state] }
+      end
+
+      def error
+        if task_group_data[FAILED] > 0
+          "#{task_group_data[FAILED]} subtask(s) failed for task group #{@href}."
+        end
+      end
+
+      def cancel
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.16.0.rc5.1".freeze
+  VERSION = "3.16.0".freeze
 end

data/webpack/redux/actions/RedHatRepositories/helpers.js

@@ -25,16 +25,16 @@ const recommendedRepositoriesRHEL = [
 ];
 
 const recommendedRepositoriesSatTools = [
-  'satellite-tools-6.7-for-rhel-8-x86_64-rpms',
-  'rhel-7-server-satellite-tools-6.7-rpms',
-  'rhel-6-server-satellite-tools-6.7-rpms',
-  'rhel-5-server-els-satellite-tools-6.7-rpms',
+  'satellite-tools-6.8-for-rhel-8-x86_64-rpms',
+  'rhel-7-server-satellite-tools-6.8-rpms',
+  'rhel-6-server-satellite-tools-6.8-rpms',
+  'rhel-5-server-els-satellite-tools-6.8-rpms',
   'rhel-7-server-satellite-maintenance-6-rpms',
 ];
 
 const recommendedRepositoriesMisc = [
   'rhel-server-rhscl-7-rpms',
-  'rhel-7-server-satellite-capsule-6.7-rpms',
+  'rhel-7-server-satellite-capsule-6.8-rpms',
   'rhel-7-server-ansible-2.8-rpms',
 ];
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.16.0.rc5.1
+  version: 3.16.0
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -298,27 +298,27 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.5.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.5.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: pulp_2to3_migration_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0b2
+        version: 0.2.0b6
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.3.0
@@ -328,7 +328,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0b2
+        version: 0.2.0b6
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.3.0
@@ -720,6 +720,7 @@ files:
 - app/helpers/katello/concerns/dashboard_helper_extensions.rb
 - app/helpers/katello/concerns/hosts_and_hostgroups_helper_extensions.rb
 - app/helpers/katello/concerns/smart_proxy_helper_extensions.rb
+- app/helpers/katello/content_view_helper.rb
 - app/helpers/katello/errata_mailer_helper.rb
 - app/helpers/katello/hosts_and_hostgroups_helper.rb
 - app/helpers/katello/katello_url_helper.rb
@@ -882,6 +883,8 @@ files:
 - app/lib/actions/katello/repository/index_package_groups.rb
 - app/lib/actions/katello/repository/instance_update.rb
 - app/lib/actions/katello/repository/metadata_generate.rb
+- app/lib/actions/katello/repository/multi_clone_contents.rb
+- app/lib/actions/katello/repository/multi_clone_to_version.rb
 - app/lib/actions/katello/repository/purge_empty_content.rb
 - app/lib/actions/katello/repository/refresh_repository.rb
 - app/lib/actions/katello/repository/remove_content.rb
@@ -992,6 +995,7 @@ files:
 - app/lib/actions/pulp3/orchestration/repository/delete.rb
 - app/lib/actions/pulp3/orchestration/repository/generate_metadata.rb
 - app/lib/actions/pulp3/orchestration/repository/import_upload.rb
+- app/lib/actions/pulp3/orchestration/repository/multi_copy_all_units.rb
 - app/lib/actions/pulp3/orchestration/repository/refresh_if_needed.rb
 - app/lib/actions/pulp3/orchestration/repository/refresh_repos.rb
 - app/lib/actions/pulp3/orchestration/repository/remove_units.rb
@@ -1015,6 +1019,7 @@ files:
 - app/lib/actions/pulp3/repository/delete_remote.rb
 - app/lib/actions/pulp3/repository/delete_version.rb
 - app/lib/actions/pulp3/repository/import_upload.rb
+- app/lib/actions/pulp3/repository/multi_copy_content.rb
 - app/lib/actions/pulp3/repository/multi_copy_units.rb
 - app/lib/actions/pulp3/repository/presenters/abstract_sync_presenter.rb
 - app/lib/actions/pulp3/repository/presenters/content_unit_presenter.rb
@@ -1402,6 +1407,8 @@ files:
 - app/services/katello/pulp3/smart_proxy_mirror_repository.rb
 - app/services/katello/pulp3/smart_proxy_repository.rb
 - app/services/katello/pulp3/srpm.rb
+- app/services/katello/pulp3/task.rb
+- app/services/katello/pulp3/task_group.rb
 - app/services/katello/pulp3/yum_metadata_file.rb
 - app/services/katello/puppet_class_importer_extensions.rb
 - app/services/katello/pxe_files_downloader.rb
@@ -4878,9 +4885,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: