Update to schedule files to work with setup-cleanup branch

schedule_files/ace_basic

@@ -1,6 +1,6 @@
 t/setup_01_install.py
-t/setup_02_nodecreate.py
-t/setup_03_noderun.py
+t/setup_03_node_install.py
+t/setup_04_node_setup.py
 t/cluster_1_gen_json.py
 
 t/ace_01_setup.py
@@ -19,5 +19,5 @@ t/ace_60_table_repair.py
 t/ace_61_table_repair_errors.py
 t/ace_99_cleanup.py
 
-t/cleanup_01_noderemove.py
-t/cleanup_02_pgremove.py
+t/cleanup_01_node_remove.py
+t/cleanup_03_remove_nc.py

schedule_files/ace_functionality

@@ -1,6 +1,6 @@
 t/setup_01_install.py
-t/setup_02_nodecreate.py
-t/setup_03_noderun.py
+t/setup_03_node_install.py
+t/setup_04_node_setup.py
 t/cluster_1_gen_json.py
 
 t/ace_70_functionality.py
@@ -9,5 +9,5 @@ t/ace_72_edge_cases.py
 t/ace_73_bigloop.py
 t/ace_74_diff_files.py
 
-t/cleanup_01_noderemove.py
-t/cleanup_02_pgremove.py
+t/cleanup_01_node_remove.py
+t/cleanup_03_remove_nc.py

schedule_files/ace_long

@@ -1,6 +1,6 @@
 t/setup_01_install.py
-t/setup_02_nodecreate.py
-t/setup_03_noderun.py
+t/setup_03_node_install.py
+t/setup_04_node_setup.py
 t/cluster_1_gen_json.py
 
 t/spock_1_setup.py
@@ -31,5 +31,5 @@ t/ace_73_bigloop.py
 t/ace_74_diff_files.py
 t/ace_99_cleanup.py
 
-t/cleanup_01_noderemove.py
-t/cleanup_02_pgremove.py
+t/cleanup_01_node_remove.py
+t/cleanup_03_remove_nc.py

schedule_files/auto_ddl_schedule

@@ -1,21 +1,18 @@
 ##
 # setup scripts
 ##
-t/8000a_env_setup_pgedge_node1.pl
-t/8001a_env_setup_pgedge_node2.pl
-t/8000b_install_pgedge_node1.pl
-t/8001b_install_pgedge_node2.pl
+t/setup_01_install.py
+t/setup_03_node_install.py
+t/setup_04_node_setup.py
 
 ##
 # node creation
 ##
-t/8051_env_create_node1.pl
-t/8052_env_create_node2.pl
+t/spock_2_node_create.py
 ##
 # sub-create
 ##
-t/6000_setup_sub_create_n1n2_n1.pl
-t/6001_setup_sub_create_n2n1_n2.pl
+t/spock_3_sub_create.py
 ##
 # enable autoDDL GUCS
 ##
@@ -24,6 +21,7 @@ t/6011_setup_autoddl_gucs_on_n2.pl
 ##
 # autoDDL scripts
 ##
+t/auto_ddl/6001_env_prereq_autoddl_setup_n1.sql
 t/auto_ddl/6100a_table_datatypes_create_alter_n1.sql
 t/auto_ddl/6100b_table_validate_and_drop_n2.sql
 t/auto_ddl/6100c_table_validate_n1.sql
@@ -51,18 +49,15 @@ t/auto_ddl/6177c_allow_ddl_from_func_proc_validate_n1.sql
 t/auto_ddl/6666a_all_objects_create_n1.sql
 t/auto_ddl/6666b_all_objects_validate_and_drop_n2.sql
 t/auto_ddl/6666c_all_objects_validate_n1.sql
+t/auto_ddl/6901_env_cleanup_autoddl_n1.sql
 ##
 # cleanup scripts
 ##
 t/6910_teardown_autoddl_gucs_off_n1.pl
 t/6911_teardown_autoddl_gucs_off_n2.pl
-t/8082_env_sub_drop_n1.pl
-t/8083_env_sub_drop_n2.pl
-t/8086_env_node_drop_n1.pl
-t/8087_env_node_drop_n2.pl
+t/spock_6_drop.py
 
 ##
 # uninstall pgedge
 ##
-t/8998_env_remove_pgedge_node1.pl
-t/8999_env_remove_pgedge_node2.pl
+t/cleanup_01_node_remove.py

schedule_files/cluster_schedule

@@ -1,27 +1,30 @@
 ## Set up tests for a two node cluster
-t/020_nodectl_install_pgedge.pl
-t/cluster-create-json.py
-t/cluster-json-validate.py
-t/cluster-json-invalid-file.py
+t/setup_01_install.py
 t/cluster-init.py
-t/get_info.py
 t/cluster-remove-node.py
 t/cluster-add-node.py
 t/cluster-list-nodes.py
-t/cluster-init-bad-json.py
 t/cluster-replication-check.py
 
 ## Remove components, Clean environment and free ports
-t/8998_env_remove_pgedge_node1.pl
-t/8999_env_remove_pgedge_node2.pl
-t/9998_remove_nc_and_pgpass_dirs.py
+t/cleanup_01_node_remove.py
+t/cleanup_03_remove_nc.py
+
+t/setup_01_install.py
+t/cluster-create-json.py
+t/cluster-json-validate.py
+t/cluster-json-invalid-file.py
+t/cluster-init-bad-version.py
+t/cluster-init-bad-json.py
+
+## Remove components, Clean environment and free ports
+t/cleanup_03_remove_nc.py
 
 ## Multi-node cluster tests
-t/020_nodectl_install_pgedge.pl
-t/multi-db_cluster_setup.py
+t/setup_01_install.py
+#t/multi-db_cluster_setup.py
 t/multi-db_cluster_exercise_ace.py
 
 ## Remove components, Clean environment and free ports
-t/8998_env_remove_pgedge_node1.pl
-t/8999_env_remove_pgedge_node2.pl
-t/9998_remove_nc_and_pgpass_dirs.py
+#t/cleanup_01_node_remove.py
+t/cleanup_03_remove_nc.py

schedule_files/db_schedule

@@ -1,12 +1,9 @@
 ##
 #
-t/020_nodectl_install_pgedge.pl
-t/8000a_env_setup_pgedge_node1.pl
-t/8001a_env_setup_pgedge_node2.pl
-t/8000b_install_pgedge_node1.pl
-t/8001b_install_pgedge_node2.pl
-t/8051_env_create_node1.pl
-t/8052_env_create_node2.pl
+t/setup_01_install.py
+t/setup_03_node_install.py
+t/setup_04_node_setup.py
+t/spock_2_node_create.py
 
 t/db-guc-show.py
 t/db-guc-show-no-guc.py
@@ -19,8 +16,5 @@ t/db-guc-set-no-reload.py
 t/db-guc-set-invalid-value.py
 
 ##Teardown Scripts
-t/8998_env_remove_pgedge_node1.pl
-t/8999_env_remove_pgedge_node2.pl
-t/9998_remove_nc_and_pgpass_dirs.py
-
-
+t/cleanup_01_node_remove.py
+t/cleanup_03_remove_nc.py

schedule_files/filtering_schedule

@@ -1,27 +1,16 @@
 ## Set up a two node cluster
-t/020_nodectl_install_pgedge.pl
-#t/300_setup_script.pl
-
-## Setup scripts for lower level directory
-t/8000a_env_setup_pgedge_node1.pl
-t/8001a_env_setup_pgedge_node2.pl
-t/8000b_install_pgedge_node1.pl
-t/8001b_install_pgedge_node2.pl
-##
-t/8051_env_create_node1.pl
-t/8052_env_create_node2.pl
-t/6000_setup_sub_create_n1n2_n1.pl 
-t/6001_setup_sub_create_n2n1_n2.pl 
+t/setup_01_install.py
 
+## Setup scripts
+t/cluster-init.py
 
 #Filtering scripts
 t/column_filtering.pl 
 t/row_filtering.pl
 t/partition_filtering.pl
 
 ## Remove components, Clean environment and free ports
-t/8998_env_remove_pgedge_node1.pl
-t/8999_env_remove_pgedge_node2.pl
+t/cleanup_01_node_remove.py
 
 # Delete the nc directory and pgpass file
-t/9998_remove_nc_and_pgpass_dirs.py
+t/cleanup_03_remove_nc.py