Revert "Remove 6.1.x from upgrade paths"

This reverts commit 8376ce9.

Author: BaurzhanSakhariev

tests/bwc/test_hotfix_downgrades.py

@@ -52,6 +52,10 @@ def _run_downgrades(self, node):
                     xs = [row[0] for row in c.fetchall()]
                     self.assertEqual(xs, [10])
 
+    @unittest.skip("""
+    This is expected to fail as 6.1.1 can't downgrade
+    to 6.1.0 which had an issue with oid serialization.
+    """)
     def test_can_downgrade_latest_testing_within_hotfix_versions(self):
         cluster = self._new_cluster('latest-testing', 2)
         cluster.start()
@@ -62,10 +66,6 @@ def test_can_downgrade_latest_testing_within_hotfix_versions(self):
         self._run_downgrades(node)
         cluster.stop()
 
-    @unittest.skip("""
-    This is expected to fail until CrateDB v6.1.1 is out
-    as 6.1.0 has issues with oid serialization.
-    """)
     def test_can_downgrade_unreleased_testing_branch_within_hotfix_versions(self):
         versions = fetch_versions()
         version = versions["testing"]["version"]

tests/bwc/test_rolling_upgrade.py

@@ -45,7 +45,8 @@
     UpgradePath('5.9.x', '5.10.x'),
     UpgradePath('5.10.x', '6.0.x'),
     UpgradePath('6.0.x', '6.0'),
-    UpgradePath('6.0', '6.1'),
+    UpgradePath('6.0', '6.1.x'),
+    UpgradePath('6.1.x', '6.1'),
     UpgradePath('6.1', 'latest-nightly'),
 )
 

tests/bwc/test_upgrade.py

@@ -60,6 +60,7 @@
         VersionDef('5.10.x', []),
         VersionDef('6.0.x', []),
         VersionDef('6.0', []),
+        VersionDef('6.1.x', []),
         VersionDef('6.1', []),
         VersionDef('latest-nightly', [])
     )