Fixing upgrade paths for Neo

Change-Id: I8048c2317a370a9baab2e457cd82df34938eeb6e
Reviewed-on: https://review.couchbase.org/c/testrunner/+/169955
Tested-by: Thuan Nguyen <soccon@gmail.com>
Reviewed-by: Thuan Nguyen <soccon@gmail.com>

conf/upgrade/upgrade_xdcr_to_cc_with_collection.conf

@@ -1,16 +1,28 @@
 upgrade.xdcr_upgrade_collections.XDCRUpgradeCollectionsTests:
-    test_xdcr_upgrade_with_services,initial_version=6.0.0-1693,nodes_init=4,after_upgrade_buckets_flush=True,enable_migration=True,after_events=bucket_flush-kv_after_ops_create,skip_security_scan=True
-    test_xdcr_upgrade_with_services,initial_version=6.0.1-2037,nodes_init=4,after_upgrade_buckets_flush=True,enable_migration=True,skip_security_scan=True
-    test_xdcr_upgrade_with_services,initial_version=6.0.2-2601,nodes_init=4,after_events=rebalance_out-rebalance_in,skip_security_scan=True
-    test_xdcr_upgrade_with_services,initial_version=6.0.3-2895,nodes_init=4,after_events=rebalance_out-rebalance_in,dgm_run=True,skip_security_scan=True
-    test_xdcr_upgrade_with_services,initial_version=6.0.4-3090,nodes_init=3,after_events=rebalance_in-rebalance_out,dgm_run=True,skip_security_scan=True
-    test_xdcr_upgrade_with_services,initial_version=6.0.5-3340,nodes_init=3,after_events=rebalance_in-rebalance_out,dgm_run=True
-    test_xdcr_upgrade_with_services,initial_version=6.5.0-4967,nodes_init=3,after_events=rebalance_in,travel_sample_bucket=true
-    test_xdcr_upgrade_with_services,initial_version=6.5.1-6296,nodes_init=4,enable_migration=True,travel_sample_bucket=true
-    test_xdcr_upgrade_with_services,initial_version=6.5.2-6627,nodes_init=4,enable_migration=True,after_events=rebalance_out-rebalance_in
-    test_xdcr_upgrade_with_services,items=10000,initial_version=6.6.1-9213,nodes_init=3,initial-services-setting=kv,fts-kv,n1ql,index-cbas,initialize_events=kv_ops_initialize,data_analysis=True,after_events=create_scope_collection-load_collection-verify_collection_data,upgrade_services_in=same
+    test_xdcr_upgrade_with_services,initial_version=6.5.0-4967,nodes_init=4,after_upgrade_buckets_flush=True,enable_migration=True,skip_security_scan=True
+    test_xdcr_upgrade_with_services,initial_version=6.5.1-6296,nodes_init=4,after_upgrade_buckets_flush=True,enable_migration=True,skip_security_scan=True
+    test_xdcr_upgrade_with_services,initial_version=6.6.0-7909,nodes_init=4,after_upgrade_buckets_flush=True,enable_migration=True,skip_security_scan=True
+    test_xdcr_upgrade_with_services,initial_version=6.6.1-9213,nodes_init=4,after_upgrade_buckets_flush=True,enable_migration=True,skip_security_scan=True
+    test_xdcr_upgrade_with_services,initial_version=7.0.0-5302,nodes_init=4,after_upgrade_buckets_flush=True,enable_migration=True,skip_security_scan=True
+    test_xdcr_upgrade_with_services,initial_version=7.0.1-6102,nodes_init=4,after_upgrade_buckets_flush=True,enable_migration=True,skip_security_scan=True
+    # rebalance
+    test_xdcr_upgrade_with_services,initial_version=6.5.0-4967,nodes_init=3,after_events=rebalance_in-rebalance_out,skip_security_scan=True
+    test_xdcr_upgrade_with_services,initial_version=6.5.1-6296,nodes_init=4,after_events=rebalance_out-rebalance_in,dgm_run=True,skip_security_scan=True
+    test_xdcr_upgrade_with_services,initial_version=6.6.0-7909,nodes_init=3,after_events=rebalance_in-rebalance_out,skip_security_scan=True
+    test_xdcr_upgrade_with_services,initial_version=6.6.1-9213,nodes_init=4,after_events=rebalance_out-rebalance_in,dgm_run=True,skip_security_scan=True
+    test_xdcr_upgrade_with_services,initial_version=7.0.0-5302,nodes_init=3,after_events=rebalance_in-rebalance_out,skip_security_scan=True
+    test_xdcr_upgrade_with_services,initial_version=7.0.1-6102,nodes_init=4,after_events=rebalance_out-rebalance_in,dgm_run=True,skip_security_scan=True
+    # migration
+    test_xdcr_upgrade_with_services,items=20000,initial_version=6.5.0-4967,nodes_init=4,initialize_events=kv_ops_initialize,enable_migration=True,after_events=create_scope_collection-load_collection-verify_collection_data
+    test_xdcr_upgrade_with_services,items=20000,initial_version=6.5.1-6296,nodes_init=4,initialize_events=kv_ops_initialize,enable_migration=True,after_events=create_scope_collection-load_collection-verify_collection_data
     test_xdcr_upgrade_with_services,items=20000,initial_version=6.6.0-7909,nodes_init=4,initialize_events=kv_ops_initialize,enable_migration=True,after_events=create_scope_collection-load_collection-verify_collection_data
-    test_xdcr_upgrade_with_services,items=20000,initial_version=6.6.2-9508,nodes_init=4,initialize_events=kv_ops_initialize,enable_migration=True,after_events=create_scope_collection-load_collection-verify_collection_data
-    test_xdcr_upgrade_with_services,items=20000,initial_version=6.6.3-9808,nodes_init=4,initialize_events=kv_ops_initialize,enable_migration=True,after_events=create_scope_collection-load_collection-verify_collection_data
+    test_xdcr_upgrade_with_services,items=20000,initial_version=6.6.1-9213,nodes_init=4,initialize_events=kv_ops_initialize,enable_migration=True,after_events=create_scope_collection-load_collection-verify_collection_data
     test_xdcr_upgrade_with_services,items=20000,initial_version=7.0.0-5302,nodes_init=4,initialize_events=kv_ops_initialize,enable_migration=True,after_events=create_scope_collection-load_collection-verify_collection_data
     test_xdcr_upgrade_with_services,items=20000,initial_version=7.0.1-6102,nodes_init=4,initialize_events=kv_ops_initialize,enable_migration=True,after_events=create_scope_collection-load_collection-verify_collection_data
+    # misc
+    test_xdcr_upgrade_with_services,initial_version=6.5.0-4967,nodes_init=3,after_events=rebalance_in,travel_sample_bucket=true
+    test_xdcr_upgrade_with_services,initial_version=6.5.1-6296,nodes_init=4,enable_migration=True,travel_sample_bucket=true
+    test_xdcr_upgrade_with_services,initial_version=6.6.0-7909,nodes_init=4,enable_migration=True,after_events=rebalance_out-rebalance_in
+    test_xdcr_upgrade_with_services,items=10000,initial_version=6.6.1-9213,nodes_init=3,initial-services-setting=kv,fts-kv,n1ql,index-cbas,initialize_events=kv_ops_initialize,data_analysis=True,after_events=create_scope_collection-load_collection-verify_collection_data,upgrade_services_in=same
+    test_xdcr_upgrade_with_services,items=20000,initial_version=7.0.0-5302,nodes_init=4,initialize_events=kv_ops_initialize,after_events=create_scope_collection-load_collection-verify_collection_data
+    test_xdcr_upgrade_with_services,items=20000,initial_version=7.0.1-6102,nodes_init=4,initialize_events=kv_ops_initialize,enable_migration=True,after_events=create_scope_collection-load_collection-verify_collection_data,travel_sample_bucket=true,rebalance_out-rebalance_in