From b5919db7d63ef0da6227e13dc52ce1be5f92da3f Mon Sep 17 00:00:00 2001 From: Michael Li Date: Thu, 29 Jan 2026 10:27:18 -0500 Subject: [PATCH] test(e2e): Add step to wait for worker to init (cherry picked from commit 57b649301f3d13e560bfd74f26e39bdeb24f72bd) --- enos/enos-scenario-e2e-aws-rdp-base.hcl | 1 + enos/modules/aws_rdp_member_server_with_worker/main.tf | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/enos/enos-scenario-e2e-aws-rdp-base.hcl b/enos/enos-scenario-e2e-aws-rdp-base.hcl index c42ef8e328..e5f32bd71b 100644 --- a/enos/enos-scenario-e2e-aws-rdp-base.hcl +++ b/enos/enos-scenario-e2e-aws-rdp-base.hcl @@ -290,6 +290,7 @@ scenario "e2e_aws_rdp_base" { step.create_boundary_cluster, step.create_rdp_domain_controller, step.create_rdp_member_server, + step.create_windows_worker, step.create_bucket ] diff --git a/enos/modules/aws_rdp_member_server_with_worker/main.tf b/enos/modules/aws_rdp_member_server_with_worker/main.tf index 3ff51f079b..cefc7c382a 100644 --- a/enos/modules/aws_rdp_member_server_with_worker/main.tf +++ b/enos/modules/aws_rdp_member_server_with_worker/main.tf @@ -372,17 +372,11 @@ resource "enos_local_exec" "run_powershell_script" { inline = ["ssh -i ${local.private_key} -o IdentitiesOnly=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no Administrator@${aws_instance.worker.public_ip} ${local.test_dir}/${basename(local_file.powershell_script.filename)}"] } -resource "time_sleep" "wait_2_minutes" { +resource "time_sleep" "wait_for_instance_reboot_in_script" { depends_on = [enos_local_exec.run_powershell_script] create_duration = "2m" } -data "aws_instance" "instance_password" { - depends_on = [time_sleep.wait_2_minutes] - instance_id = aws_instance.worker.id - get_password_data = true -} - # used for debug resource "local_file" "powershell_script_output" { depends_on = [enos_local_exec.run_powershell_script]