From 96d746b2952f0751e107785526ce31c7a67471ad Mon Sep 17 00:00:00 2001 From: Shiv Bhosale Date: Tue, 3 Jun 2025 12:22:06 -0700 Subject: [PATCH 1/2] wait for launch-template-stack deletion to avoid race conditions when deleting node-role-stack --- tests/tekton-resources/tasks/teardown/awscli-eks.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/tekton-resources/tasks/teardown/awscli-eks.yaml b/tests/tekton-resources/tasks/teardown/awscli-eks.yaml index d7aa3ad4..9dce4d62 100644 --- a/tests/tekton-resources/tasks/teardown/awscli-eks.yaml +++ b/tests/tekton-resources/tasks/teardown/awscli-eks.yaml @@ -101,8 +101,12 @@ spec: image: alpine/k8s:1.23.7 script: | aws cloudformation delete-stack --stack-name $(params.service-role-stack-name) - aws cloudformation delete-stack --stack-name $(params.node-role-stack-name) aws cloudformation delete-stack --stack-name $(params.launch-template-stack-name) + # wait for the launch-template stack to be completely deleted to avoid race-conditions. + echo "waiting for launch-template stack deletion..." + aws cloudformation wait stack-delete-complete --stack-name $(params.launch-template-stack-name)" + aws cloudformation delete-stack --stack-name $(params.node-role-stack-name) --deletion-mode FORCE_DELETE_STACK + - name: awscli-delete-vpc image: alpine/k8s:1.23.7 script: | From 174d2f86de9c0ecdb325eea1d7ab5145909a91fa Mon Sep 17 00:00:00 2001 From: Shiv Bhosale Date: Tue, 3 Jun 2025 15:12:41 -0700 Subject: [PATCH 2/2] unterminated string --- tests/tekton-resources/tasks/teardown/awscli-eks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tekton-resources/tasks/teardown/awscli-eks.yaml b/tests/tekton-resources/tasks/teardown/awscli-eks.yaml index 9dce4d62..a8098857 100644 --- a/tests/tekton-resources/tasks/teardown/awscli-eks.yaml +++ b/tests/tekton-resources/tasks/teardown/awscli-eks.yaml @@ -104,7 +104,7 @@ spec: aws cloudformation delete-stack --stack-name $(params.launch-template-stack-name) # wait for the launch-template stack to be completely deleted to avoid race-conditions. echo "waiting for launch-template stack deletion..." - aws cloudformation wait stack-delete-complete --stack-name $(params.launch-template-stack-name)" + aws cloudformation wait stack-delete-complete --stack-name $(params.launch-template-stack-name) aws cloudformation delete-stack --stack-name $(params.node-role-stack-name) --deletion-mode FORCE_DELETE_STACK - name: awscli-delete-vpc