diff --git a/enos/enos-scenario-replication.hcl b/enos/enos-scenario-replication.hcl index d828f9ab9c..8311a86247 100644 --- a/enos/enos-scenario-replication.hcl +++ b/enos/enos-scenario-replication.hcl @@ -590,58 +590,6 @@ scenario "replication" { } } - step "verify_vault_version" { - description = global.description.verify_vault_version - module = module.vault_verify_version - depends_on = [ - step.create_primary_cluster, - step.wait_for_primary_cluster_leader, - ] - - providers = { - enos = local.enos_provider[matrix.distro] - } - - verifies = [ - quality.vault_api_sys_version_history_keys, - quality.vault_api_sys_version_history_key_info, - quality.vault_version_build_date, - quality.vault_version_edition, - quality.vault_version_release, - ] - - variables { - hosts = step.create_primary_cluster_targets.hosts - vault_addr = step.create_primary_cluster.api_addr_localhost - vault_edition = matrix.edition - vault_install_dir = global.vault_install_dir[matrix.artifact_type] - vault_product_version = matrix.artifact_source == "local" ? step.get_local_metadata.version : var.vault_product_version - vault_revision = matrix.artifact_source == "local" ? step.get_local_metadata.revision : var.vault_revision - vault_build_date = matrix.artifact_source == "local" ? step.get_local_metadata.build_date : var.vault_build_date - vault_root_token = step.create_primary_cluster.root_token - } - } - - step "verify_ui" { - description = global.description.verify_ui - module = module.vault_verify_ui - depends_on = [ - step.create_primary_cluster, - step.wait_for_primary_cluster_leader, - ] - - providers = { - enos = local.enos_provider[matrix.distro] - } - - verifies = quality.vault_ui_assets - - variables { - vault_addr = step.create_primary_cluster.api_addr_localhost - hosts = step.create_primary_cluster_targets.hosts - } - } - step "get_primary_cluster_ips" { description = global.description.get_vault_cluster_ip_addresses module = module.vault_get_cluster_ips @@ -690,12 +638,57 @@ scenario "replication" { } } + step "verify_vault_version" { + description = global.description.verify_vault_version + module = module.vault_verify_version + depends_on = [step.get_primary_cluster_ips] + + providers = { + enos = local.enos_provider[matrix.distro] + } + + verifies = [ + quality.vault_api_sys_version_history_keys, + quality.vault_api_sys_version_history_key_info, + quality.vault_version_build_date, + quality.vault_version_edition, + quality.vault_version_release, + ] + + variables { + hosts = step.create_primary_cluster_targets.hosts + vault_addr = step.create_primary_cluster.api_addr_localhost + vault_edition = matrix.edition + vault_install_dir = global.vault_install_dir[matrix.artifact_type] + vault_product_version = matrix.artifact_source == "local" ? step.get_local_metadata.version : var.vault_product_version + vault_revision = matrix.artifact_source == "local" ? step.get_local_metadata.revision : var.vault_revision + vault_build_date = matrix.artifact_source == "local" ? step.get_local_metadata.build_date : var.vault_build_date + vault_root_token = step.create_primary_cluster.root_token + } + } + + step "verify_ui" { + description = global.description.verify_ui + module = module.vault_verify_ui + depends_on = [step.get_primary_cluster_ips] + + providers = { + enos = local.enos_provider[matrix.distro] + } + + verifies = quality.vault_ui_assets + + variables { + vault_addr = step.create_primary_cluster.api_addr_localhost + hosts = step.create_primary_cluster_targets.hosts + } + } + step "write_test_data_on_primary" { description = global.description.verify_write_test_data module = module.vault_verify_write_data depends_on = [step.get_primary_cluster_ips] - providers = { enos = local.enos_provider[matrix.distro] } @@ -724,9 +717,10 @@ scenario "replication" { EOF module = module.vault_setup_perf_primary depends_on = [ - step.get_primary_cluster_ips, - step.get_secondary_cluster_ips, - step.write_test_data_on_primary + step.write_test_data_on_primary, + // Do base verification before continuing on to our performance replication verification. + step.verify_vault_version, + step.verify_ui, ] providers = {