foreman_maintain 0.6.2 → 0.6.3

data/definitions/scenarios/upgrade_to_satellite_6_8_z.rb

@@ -0,0 +1,84 @@
+module Scenarios::Satellite_6_8_z
+  class Abstract < ForemanMaintain::Scenario
+    def self.upgrade_metadata(&block)
+      metadata do
+        tags :upgrade_scenario
+        confine do
+          feature(:satellite) &&
+            (feature(:satellite).current_minor_version == '6.8' || \
+            ForemanMaintain.upgrade_in_progress == '6.8.z')
+        end
+        instance_eval(&block)
+      end
+    end
+
+    def target_version
+      '6.8.z'
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Satellite 6.8.z'
+      tags :pre_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:pre_upgrade))
+      add_step(Checks::Repositories::Validate.new(:version => '6.8'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Satellite 6.8.z'
+      tags :pre_migrations
+    end
+
+    def compose
+      add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Service::Stop.new)
+    end
+  end
+
+  class Migrations < Abstract
+    upgrade_metadata do
+      description 'Migration scripts to Satellite 6.8.z'
+      tags :migrations
+    end
+
+    def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.8'))
+      add_step(Procedures::Packages::UnlockVersions.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step(Procedures::Installer::Upgrade.new)
+    end
+  end
+
+  class PostMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures after migrating to Satellite 6.8.z'
+      tags :post_migrations
+    end
+
+    def compose
+      add_step(Procedures::Service::Start.new)
+      add_steps(find_procedures(:post_migrations))
+    end
+  end
+
+  class PostUpgradeChecks < Abstract
+    upgrade_metadata do
+      description 'Checks after upgrading to Satellite 6.8.z'
+      tags :post_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:post_upgrade))
+    end
+  end
+end

data/lib/foreman_maintain.rb

@@ -139,5 +139,9 @@ module ForemanMaintain
     rescue StandardError => e
       logger.error "Invalid Storage label i.e #{label}. Error - #{e.message}"
     end
+
+    def upgrade_in_progress
+      storage[:upgrade_target_version]
+    end
   end
 end

data/lib/foreman_maintain/cli.rb

@@ -10,6 +10,7 @@ require 'foreman_maintain/cli/service_command'
 require 'foreman_maintain/cli/restore_command'
 require 'foreman_maintain/cli/maintenance_mode_command'
 require 'foreman_maintain/cli/packages_command'
+require 'foreman_maintain/cli/content_command'
 
 module ForemanMaintain
   module Cli
@@ -23,6 +24,7 @@ module ForemanMaintain
       subcommand 'restore', 'Restore a backup', RestoreCommand
       subcommand 'packages', 'Lock/Unlock package protection, install, update', PackagesCommand
       subcommand 'advanced', 'Advanced tools for server maintenance', AdvancedCommand
+      subcommand 'content', 'Content related commands', ContentCommand
       subcommand 'maintenance-mode', 'Control maintenance-mode for application',
                  MaintenanceModeCommand
 

data/lib/foreman_maintain/cli/content_command.rb

@@ -0,0 +1,17 @@
+module ForemanMaintain
+  module Cli
+    class ContentCommand < Base
+      subcommand 'prepare', 'Prepare content for Pulp 3' do
+        def execute
+          run_scenarios_and_exit(Scenarios::Content::Prepare.new)
+        end
+      end
+
+      subcommand 'switchover', 'Switch support for certain content from Pulp 2 to Pulp 3' do
+        def execute
+          run_scenarios_and_exit(Scenarios::Content::Switchover.new)
+        end
+      end
+    end
+  end
+end

data/lib/foreman_maintain/concerns/base_database.rb

@@ -150,6 +150,17 @@ module ForemanMaintain
         end
       end
 
+      def db_version(config = configuration)
+        if ping(config)
+          # Note - t removes headers, -A removes alignment whitespace
+          server_version_cmd = psql_command(config) + ' -c "SHOW server_version" -t -A'
+          version_string = execute!(server_version_cmd, :hidden_patterns => [config['password']])
+          version(version_string)
+        else
+          raise_service_error
+        end
+      end
+
       private
 
       def base_command(config, command = 'psql')

data/lib/foreman_maintain/concerns/downstream.rb

@@ -98,16 +98,21 @@ module ForemanMaintain
       end
 
       def common_repos(rh_version_major, full_version)
-        tools_repo_id = "rhel-#{rh_version_major}-server-satellite-tools-#{full_version}-rpms"
-        maintenance_repo_id = "rhel-#{rh_version_major}-server-satellite-maintenance-6-rpms"
+        repos_arrary = common_repos_array(rh_version_major, full_version)
+        return repos_arrary.first(1) if feature(:capsule)
 
-        # Override to use Beta repositories for sat version until GA
-        if ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
-          tools_repo_id = "rhel-#{rh_version_major}-server-satellite-tools-6-beta-rpms"
-          maintenance_repo_id = "rhel-#{rh_version_major}-server-satellite-maintenance-6-beta-rpms"
-        end
+        repos_arrary
+      end
+
+      def common_repos_array(rh_version_major, full_version)
+        ["rhel-#{rh_version_major}-server-satellite-maintenance-6#{use_beta}-rpms",
+         "rhel-#{rh_version_major}-server-satellite-tools-#{full_version}#{use_beta}-rpms"]
+      end
+
+      def use_beta
+        return '-beta' if ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
 
-        [tools_repo_id, maintenance_repo_id]
+        nil
       end
 
       def main_rh_repos(rh_version_major)

data/lib/foreman_maintain/upgrade_runner.rb

@@ -15,29 +15,8 @@ module ForemanMaintain
       def available_targets
         # when some upgrade is in progress, we don't allow upgrade to different version
         return [current_target_version] if current_target_version
-        versions_to_tags.inject([]) do |available_targets, (version, tag)|
-          if !find_scenarios(:tags => [tag]).empty?
-            available_targets << version
-          else
-            available_targets
-          end
-        end.sort
-      end
-
-      def versions_to_tags
-        @versions_to_tags ||= {}
-      end
-
-      # registers target version to specific tag
-      def register_version(version, tag)
-        if versions_to_tags.key?(version) && versions_to_tags[version] != tag
-          raise "Version #{version} already registered to tag #{versions_to_tags[version]}"
-        end
-        @versions_to_tags[version] = tag
-      end
 
-      def clear_register
-        versions_to_tags.clear
+        find_scenarios(:tags => :upgrade_scenario).map(&:target_version).uniq.sort
       end
 
       def current_target_version
@@ -57,25 +36,35 @@ module ForemanMaintain
 
     def initialize(version, reporter, options = {})
       super(reporter, [], options)
-      @tag = self.class.versions_to_tags[version]
-      raise "Unknown version #{version}" unless tag
       @version = version
+      scenarios_present = find_scenarios(:tags => :upgrade_scenario).any?(&matching_version_test)
+      raise "Unknown version #{version}" unless scenarios_present
+
       @scenario_cache = {}
       self.phase = :pre_upgrade_checks
     end
 
     def scenario(phase)
       return @scenario_cache[phase] if @scenario_cache.key?(phase)
-      condition = { :tags => [tag, phase] }
-      matching_scenarios = find_all_scenarios(condition)
+
+      condition = { :tags => [:upgrade_scenario, phase] }
+      matching_scenarios = find_scenarios(condition).select(&matching_version_test)
       raise "Too many scenarios match #{condition.inspect}" if matching_scenarios.size > 1
+
       @scenario_cache[phase] = matching_scenarios.first
     end
 
+    def matching_version_test
+      proc do |scenario|
+        scenario.respond_to?(:target_version) && scenario.target_version == @version
+      end
+    end
+
     def run
       self.class.current_target_version = @version
       PHASES.each do |phase|
         return run_rollback if quit?
+
         if skip?(phase)
           skip_phase(phase)
         else
@@ -127,6 +116,7 @@ module ForemanMaintain
     # deserializes the state of the run from the storage
     def load
       return unless storage[:serialized]
+
       load_from_hash(storage[:serialized])
     end
 
@@ -134,6 +124,7 @@ module ForemanMaintain
       with_non_empty_scenario(phase) do |scenario|
         confirm_scenario(scenario)
         return if quit?
+
         self.phase = phase
         run_scenario(scenario)
         # if we started from the :pre_upgrade_checks, ensure to ask before
@@ -158,6 +149,7 @@ module ForemanMaintain
     # rubocop:disable Metrics/MethodLength
     def rollback_pre_migrations
       raise "Unexpected phase #{phase}, expecting pre_migrations" unless phase == :pre_migrations
+
       rollback_needed = scenario(:pre_migrations).steps.any? { |s| s.executed? && s.success? }
       if rollback_needed
         @quit = false
@@ -198,6 +190,7 @@ module ForemanMaintain
       unless @scenario_cache.empty?
         raise "Some scenarios are already initialized: #{@scenario_cache.keys}"
       end
+
       self.phase = hash[:phase]
       hash[:scenarios].each do |key, scenario_hash|
         @scenario_cache[key] = Scenario.new_from_hash(scenario_hash)
@@ -229,6 +222,7 @@ module ForemanMaintain
 
     def phase=(phase)
       raise "Unknown phase #{phase}" unless PHASES.include?(phase)
+
       @phase = phase
     end
   end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.6.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -132,6 +132,7 @@ files:
 - definitions/checks/foreman/db_up.rb
 - definitions/checks/foreman/facts_names.rb
 - definitions/checks/foreman/puppet_class_duplicates.rb
+- definitions/checks/foreman/validate_external_db_version.rb
 - definitions/checks/foreman_openscap/invalid_report_associations.rb
 - definitions/checks/foreman_proxy/verify_dhcp_config_syntax.rb
 - definitions/checks/foreman_tasks/invalid/check_old.rb
@@ -263,6 +264,7 @@ files:
 - definitions/procedures/restore/pg_global_objects.rb
 - definitions/procedures/restore/postgres_owner.rb
 - definitions/procedures/restore/pulpcore_dump.rb
+- definitions/procedures/restore/regenerate_missing_queues.rb
 - definitions/procedures/selinux/set_file_security.rb
 - definitions/procedures/service/base.rb
 - definitions/procedures/service/daemon_reload.rb
@@ -276,10 +278,15 @@ files:
 - definitions/procedures/sync_plans/disable.rb
 - definitions/procedures/sync_plans/enable.rb
 - definitions/scenarios/backup.rb
+- definitions/scenarios/content.rb
 - definitions/scenarios/maintenance_mode.rb
 - definitions/scenarios/packages.rb
 - definitions/scenarios/restore.rb
 - definitions/scenarios/services.rb
+- definitions/scenarios/upgrade_to_capsule_6_7.rb
+- definitions/scenarios/upgrade_to_capsule_6_7_z.rb
+- definitions/scenarios/upgrade_to_capsule_6_8.rb
+- definitions/scenarios/upgrade_to_capsule_6_8_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_2.rb
 - definitions/scenarios/upgrade_to_satellite_6_2_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_3.rb
@@ -292,6 +299,8 @@ files:
 - definitions/scenarios/upgrade_to_satellite_6_6_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_7.rb
 - definitions/scenarios/upgrade_to_satellite_6_7_z.rb
+- definitions/scenarios/upgrade_to_satellite_6_8.rb
+- definitions/scenarios/upgrade_to_satellite_6_8_z.rb
 - extras/foreman-maintain.sh
 - extras/foreman_protector/foreman-protector.conf
 - extras/foreman_protector/foreman-protector.py
@@ -309,6 +318,7 @@ files:
 - lib/foreman_maintain/cli/advanced_command.rb
 - lib/foreman_maintain/cli/backup_command.rb
 - lib/foreman_maintain/cli/base.rb
+- lib/foreman_maintain/cli/content_command.rb
 - lib/foreman_maintain/cli/health_command.rb
 - lib/foreman_maintain/cli/maintenance_mode_command.rb
 - lib/foreman_maintain/cli/packages_command.rb
@@ -390,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt