Now support N and N-1 for real

Previous patch contained all necessery refactoring so this one will be only changing the upgrade_paths.json and modifying the get_target_version logic.
oamg · Jan 7, 2022 · f3a739f · f3a739f
1 parent 8220b70
commit f3a739f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/commands/command_utils.py b/commands/command_utils.py
@@ -112,7 +112,7 @@ def get_supported_target_versions(flavour=get_upgrade_flavour()):
 
 def get_target_version(flavour):
     target_versions = get_supported_target_versions(flavour)
-    return target_versions[0] if target_versions else None
+    return target_versions[-1] if target_versions else None
 
 
 def vet_upgrade_path(args):

diff --git a/repos/system_upgrade/common/files/upgrade_paths.json b/repos/system_upgrade/common/files/upgrade_paths.json
@@ -1,13 +1,13 @@
 {
     "default": {
-        "7.6": ["8.4"],
-        "7.9": ["8.4"],
+        "7.6": ["8.4", "8.6"],
+        "7.9": ["8.4", "8.6"],
         "8.6": ["9.0"],
-        "7": ["8.4"],
+        "7": ["8.4", "8.6"],
         "8": ["9.0"]
     },
     "saphana": {
-        "7.9": ["8.2"],
-        "7": ["8.4"]
+        "7.9": ["8.2", "8.4"],
+        "7": ["8.2", "8.4"]
     }
 }