From 12e0a3aaec607c38c4442ca23405dd796b20ff21 Mon Sep 17 00:00:00 2001 From: Michael Li Date: Fri, 13 Feb 2026 15:11:39 -0500 Subject: [PATCH] test(e2e): Update wait_for_ssh timeout to 900s --- enos/modules/aws_rdp_domain_controller/main.tf | 2 +- enos/modules/aws_rdp_member_server/main.tf | 2 +- enos/modules/aws_rdp_member_server_with_worker/main.tf | 6 ++---- enos/modules/aws_windows_client/main.tf | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/enos/modules/aws_rdp_domain_controller/main.tf b/enos/modules/aws_rdp_domain_controller/main.tf index fa43de0da5..470152c83c 100644 --- a/enos/modules/aws_rdp_domain_controller/main.tf +++ b/enos/modules/aws_rdp_domain_controller/main.tf @@ -482,7 +482,7 @@ data "aws_instance" "instance_password" { resource "enos_local_exec" "wait_for_ssh" { depends_on = [time_sleep.wait_for_reboot] count = var.server_version != "2016" ? 1 : 0 - inline = ["timeout 600s bash -c 'until ssh -i ${abspath(local_sensitive_file.private_key.filename)} -o BatchMode=Yes -o IdentitiesOnly=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=5 Administrator@${aws_instance.domain_controller.public_ip} \"echo ready\"; do sleep 10; done'"] + inline = ["timeout 900s bash -c 'until ssh -i ${abspath(local_sensitive_file.private_key.filename)} -o BatchMode=Yes -o IdentitiesOnly=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=5 Administrator@${aws_instance.domain_controller.public_ip} \"echo ready\"; do sleep 10; done'"] } locals { diff --git a/enos/modules/aws_rdp_member_server/main.tf b/enos/modules/aws_rdp_member_server/main.tf index 671615e874..dee159cdaf 100644 --- a/enos/modules/aws_rdp_member_server/main.tf +++ b/enos/modules/aws_rdp_member_server/main.tf @@ -290,7 +290,7 @@ data "aws_instance" "instance_password" { resource "enos_local_exec" "wait_for_ssh" { count = var.server_version != "2016" ? 1 : 0 depends_on = [time_sleep.wait_5_minutes] - inline = ["timeout 600s bash -c 'until ssh -i ${local.private_key} -o BatchMode=Yes -o IdentitiesOnly=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=5 Administrator@${aws_instance.member_server.public_ip} \"echo ready\"; do sleep 10; done'"] + inline = ["timeout 900s bash -c 'until ssh -i ${local.private_key} -o BatchMode=Yes -o IdentitiesOnly=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=5 Administrator@${aws_instance.member_server.public_ip} \"echo ready\"; do sleep 10; done'"] } # Retrieve the domain hostname of the member server, which will be used in 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 cefc7c382a..4569c5b0cf 100644 --- a/enos/modules/aws_rdp_member_server_with_worker/main.tf +++ b/enos/modules/aws_rdp_member_server_with_worker/main.tf @@ -287,10 +287,8 @@ locals { resource "enos_local_exec" "wait_for_ssh" { - depends_on = [ - aws_instance.worker, - ] - inline = ["timeout 600s bash -c 'until ssh -i ${local.private_key} -o BatchMode=Yes -o IdentitiesOnly=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=5 Administrator@${aws_instance.worker.public_ip} \"echo ready\"; do sleep 10; done'"] + depends_on = [aws_instance.worker] + inline = ["timeout 900s bash -c 'until ssh -i ${local.private_key} -o BatchMode=Yes -o IdentitiesOnly=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=5 Administrator@${aws_instance.worker.public_ip} \"echo ready\"; do sleep 10; done'"] } resource "enos_local_exec" "make_dir" { diff --git a/enos/modules/aws_windows_client/main.tf b/enos/modules/aws_windows_client/main.tf index 863beffa1b..0e622e6248 100644 --- a/enos/modules/aws_windows_client/main.tf +++ b/enos/modules/aws_windows_client/main.tf @@ -310,7 +310,7 @@ resource "local_sensitive_file" "private_key" { # can just SSH using the private key resource "enos_local_exec" "wait_for_ssh" { depends_on = [aws_instance.client] - inline = ["timeout 600s bash -c 'until ssh -i ${abspath(local_sensitive_file.private_key.filename)} -o BatchMode=Yes -o IdentitiesOnly=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=5 Administrator@${aws_instance.client.public_ip} \"echo ready\"; do sleep 10; done'"] + inline = ["timeout 900s bash -c 'until ssh -i ${abspath(local_sensitive_file.private_key.filename)} -o BatchMode=Yes -o IdentitiesOnly=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=5 Administrator@${aws_instance.client.public_ip} \"echo ready\"; do sleep 10; done'"] } resource "enos_local_exec" "get_go_version" {