Refs #33620 - update messages in self-upgrade scenario

(cherry picked from commit c3fe0c5)
theforeman · Mar 7, 2022 · 646151b · 646151b
1 parent 8327cfb
commit 646151b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/definitions/scenarios/self_upgrade.rb b/definitions/scenarios/self_upgrade.rb
@@ -67,8 +67,8 @@ def repos_ids_to_reenable
   class SelfUpgrade < SelfUpgradeBase
     metadata do
       label :self_upgrade_foreman_maintain
-      description "Enables the specified version's maintenance repository and, "\
-  								'updates the foreman-maintain packages'
+      description "Enables the specified version's maintenance repository and,"\
+  								"\nupdates the satellite-maintain packages"
       manual_detection
     end
 
@@ -87,8 +87,8 @@ def compose
   class SelfUpgradeRescue < SelfUpgradeBase
     metadata do
       label :rescue_self_upgrade
-      description 'Disables all version specific maintenance repos and,'\
-  		' enables the repositories which were configured prior to self upgrade'
+      description 'Disables all version specific maintenance repositories and,'\
+  		 "\nenables the repositories which were configured prior to self upgrade"
       manual_detection
       run_strategy :fail_slow
     end

diff --git a/lib/foreman_maintain/cli/self_upgrade_command.rb b/lib/foreman_maintain/cli/self_upgrade_command.rb
@@ -29,7 +29,8 @@ def allow_major_version_upgrade_only
         end
         if current_downstream_version >= next_version
           message = "The target-version #{target_version} should be "\
-                    "greater than existing version #{current_downstream_version}!"
+                    "greater than existing version #{current_downstream_version},"\
+                    "\nand self-upgrade should be used for major version upgrades only!"
           raise Error::UsageError, message
         end
       end