Eli Mesika has submitted this change and it was merged. Change subject: core: Squash 03_04 upgrade scripts into base db ...................................................................... core: Squash 03_04 upgrade scripts into base db This patch introduces all changes made in dbscripts/upgrade/03_04* scripts into the base database. The process of squashing is : 1) creating a git branch with only the squashed version upgrade scripts 2) generating schema and insert files (automatically by pg_dump) 3) restoring all deleted upgrade files with version > squashed version that were deleted in 1) 4) creating a database based on 1) to 3) 5) creating a database on master 6) using the database comparison tool to verify both databases are identical (except some generated UUIDs) Change-Id: I3b9505017cd30cf492eee4e5986a6f541a16e024 Signed-off-by: emesika <emesika(a)redhat.com&gt; --- M packaging/dbscripts/create_tables.sql M packaging/dbscripts/data/00200_insert_ad_groups.sql M packaging/dbscripts/data/00340_insert_policy_units.sql M packaging/dbscripts/data/00350_insert_cluster_policies.sql M packaging/dbscripts/data/00360_insert_cluster_policy_units.sql M packaging/dbscripts/data/00500_insert_roles.sql M packaging/dbscripts/data/00700_insert_roles_groups.sql M packaging/dbscripts/data/00800_insert_images.sql M packaging/dbscripts/data/01100_insert_vm_static.sql M packaging/dbscripts/data/01400_insert_action_version_map.sql M packaging/dbscripts/data/01500_insert_event_map.sql M packaging/dbscripts/data/01600_insert_dwh_history_timekeeping.sql A packaging/dbscripts/data/02000_insert_vm_init.sql M packaging/dbscripts/dbfunc-common.sh D packaging/dbscripts/upgrade/03_04_0010_add_instance_type_to_vm.sql D packaging/dbscripts/upgrade/03_04_0020_add_instance_permissions.sql D packaging/dbscripts/upgrade/03_04_0030_add_ha_score_to_vds_statistics.sql D packaging/dbscripts/upgrade/03_04_0040_add_ha_policy_units.sql D packaging/dbscripts/upgrade/03_04_0050_move_rename_of_other_linux_type.sql D packaging/dbscripts/upgrade/03_04_0060_add_snapshot_id_column_to_vm_device.sql D packaging/dbscripts/upgrade/03_04_0070_index_network_by_external_id.sql D packaging/dbscripts/upgrade/03_04_0080_add_brick_status_change_event_map.sql D packaging/dbscripts/upgrade/03_04_0090_move_quota_id.sql D packaging/dbscripts/upgrade/03_04_0100_add_cluster_host_permissions_to_gluster_admin_role.sql D packaging/dbscripts/upgrade/03_04_0110_change_policy_names.sql D packaging/dbscripts/upgrade/03_04_0120_add_gluster_version_to_vds_dynamic.sql D packaging/dbscripts/upgrade/03_04_0130_add_start_time_idx_job.sql D packaging/dbscripts/upgrade/03_04_0140_add_sso_method_to_vm_static.sql D packaging/dbscripts/upgrade/03_04_0150_gluster_async_tasks_finished_event_map.sql D packaging/dbscripts/upgrade/03_04_0160_create_read_only_admin_role.sql D packaging/dbscripts/upgrade/03_04_0170_add_architecture_name_column.sql D packaging/dbscripts/upgrade/03_04_0180_add_vds_group_optimization_field.sql D packaging/dbscripts/upgrade/03_04_0190_gluster_async_tasks_stop_remove-brick_event_map.sql D packaging/dbscripts/upgrade/03_04_0200_gluster_async_tasks_fromcli_event_map.sql D packaging/dbscripts/upgrade/03_04_0210_replace_storage_type_all_with_unknown.sql D packaging/dbscripts/upgrade/03_04_0220_add_console_events.sql D packaging/dbscripts/upgrade/03_04_0230_vm_down_error_and_vds_initiated_run_fail_event_map.sql D packaging/dbscripts/upgrade/03_04_0240_gluster_async_tasks_notfound_fromcli_event_map.sql D packaging/dbscripts/upgrade/03_04_0250_rename_user_and_group_status_to_active.sql D packaging/dbscripts/upgrade/03_04_0260_add_external_id_to_groups.sql D packaging/dbscripts/upgrade/03_04_0270_add_task_id_idx_gluster_bricks.sql D packaging/dbscripts/upgrade/03_04_0280_add_original_template_to_vm_static.sql D packaging/dbscripts/upgrade/03_04_0290_add_spice_proxy_to_vds_groups_and_vm_pools.sql D packaging/dbscripts/upgrade/03_04_0300_add_label_column_to_networks.sql D packaging/dbscripts/upgrade/03_04_0310_add_labels_column_to_vds_interfaces.sql D packaging/dbscripts/upgrade/03_04_0320_move_anonymousHugePages.sql D packaging/dbscripts/upgrade/03_04_0330_add_admin_operations_action_groups_and_roles.sql D packaging/dbscripts/upgrade/03_04_0340_add_network_labels_action_groups.sql D packaging/dbscripts/upgrade/03_04_0350_relax_network_qos_constraints.sql D packaging/dbscripts/upgrade/03_04_0360_add_qos_id_to_network.sql D packaging/dbscripts/upgrade/03_04_0370_add_qos_overridden_to_vds_interface.sql D packaging/dbscripts/upgrade/03_04_0380_add_last_stop_time_to_vm_dynamic.sql D packaging/dbscripts/upgrade/03_04_0390_add_ha_reservation.sql D packaging/dbscripts/upgrade/03_04_0400_add_var_on_dwh_status.sql D packaging/dbscripts/upgrade/03_04_0410_add_even_guest_distribution_policy.sql D packaging/dbscripts/upgrade/03_04_0420_add_vds_pm_flags.sql D packaging/dbscripts/upgrade/03_04_0430_add_power_management_to_cluster_policy.sql D packaging/dbscripts/upgrade/03_04_0440_create_affinity_group_tables.sql D packaging/dbscripts/upgrade/03_04_0450_add_affinity_group_action_group.sql D packaging/dbscripts/upgrade/03_04_0460_add_affinity_group_filter_and_weight.sql D packaging/dbscripts/upgrade/03_04_0470_add_reboot_command.sql D packaging/dbscripts/upgrade/03_04_0480_add_vm_migration_downtime.sql D packaging/dbscripts/upgrade/03_04_0490_add_enable_ksm_to_vds_groups.sql D packaging/dbscripts/upgrade/03_04_0500_add_iscsi_bond.sql D packaging/dbscripts/upgrade/03_04_0510_set_proxy_preferences_default.sql D packaging/dbscripts/upgrade/03_04_0520_add_tables_for_gluster_volume_and_brick_details.sql D packaging/dbscripts/upgrade/03_04_0530_gluster_refresh_gluster_volume_details-event_map.sql D packaging/dbscripts/upgrade/03_04_0540_remove_storage_pool_type.sql D packaging/dbscripts/upgrade/03_04_0550_add_template_version_to_vm_static.sql D packaging/dbscripts/upgrade/03_04_0560_add_vm_init_table.sql D packaging/dbscripts/upgrade/03_04_0570_add_all_basic_filters_to_even_guest_policy.sql D packaging/dbscripts/upgrade/03_04_0580_add_restart_different_host_event.sql D packaging/dbscripts/upgrade/03_04_0590_change_storage_server_connections_password_length.sql D packaging/dbscripts/upgrade/03_04_0600_add_current_cd_to_vm_dynamic.sql D packaging/dbscripts/upgrade/03_04_0610_map_vds_detected_to_event_map.sql D packaging/dbscripts/upgrade/03_04_0620_remove_directory_suffix_from_login_name.sql D packaging/dbscripts/upgrade/03_04_0630_fix_admin_internal_permissions.sql D packaging/dbscripts/upgrade/03_04_0640_fix_even_guest_distribution_parameters.sql R packaging/dbscripts/upgrade/03_05_0000_set_version.sql 79 files changed, 627 insertions(+), 737 deletions(-) Approvals: Eli Mesika: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/50774 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b9505017cd30cf492eee4e5986a6f541a16e024 Gerrit-PatchSet: 9 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <emesika(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com&gt; Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com&gt; Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com&gt; Gerrit-Reviewer: Ravi Nori <rnori(a)redhat.com&gt; Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;