Skip to content

ROSAENG-62527: pass --no-wait to vpc delete when fire-and-forget is set #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jul 27, 2026
Merged

ROSAENG-62527: pass --no-wait to vpc delete when fire-and-forget is set #174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion test/e2e-cli/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ func customerEnv() []string {
func fireAndForgetInfraDelete(rosactlBin, clusterName, region string, resources []string) {
for _, subCmd := range resources {
GinkgoWriter.Printf("Cleanup: firing %s delete %s (fire-and-forget)\n", subCmd, clusterName)
cmd := exec.Command(rosactlBin, subCmd, "delete", clusterName, "--region", region)
args := []string{subCmd, "delete", clusterName, "--region", region, "--no-wait"}
cmd := exec.Command(rosactlBin, args...)
Comment thread
cdoan1 marked this conversation as resolved.
cmd.Env = append(os.Environ(), customerEnv()...)
if err := cmd.Start(); err != nil {
GinkgoWriter.Printf("Cleanup WARNING: failed to start %s delete: %v\n", subCmd, err)
Expand Down Expand Up @@ -832,6 +833,12 @@ var _ = Describe("ROSACTL CLI E2E Tests", Ordered, func() {

It("should be able to delete the cluster-oidc", Label("oidc-delete", "cleanup"), func() {
defer recordTiming("hcp-oidc-delete")()
if os.Getenv("ROSA_REGIONAL_TEARDOWN_FIRE_AND_FORGET") == "true" {
GinkgoWriter.Printf("Fire-and-forget mode: launching async deletes for infra stacks\n")
fireAndForgetInfraDelete(ROSACTL_BIN, clusterName, region, []string{"cluster-oidc"})
// cleanupCompleted = true
return
}
Comment thread
cdoan1 marked this conversation as resolved.
GinkgoWriter.Printf("Deleting the cluster-oidc: %s\n", clusterName)
cmd := exec.Command(ROSACTL_BIN, "cluster-oidc", "delete", clusterName, "--region", region)
cmd.Env = append(os.Environ(), customerEnv()...)
Expand All @@ -844,6 +851,12 @@ var _ = Describe("ROSACTL CLI E2E Tests", Ordered, func() {

It("should be able to delete the cluster-vpc", Label("vpc-delete", "cleanup"), func() {
defer recordTiming("hcp-vpc-delete")()
if os.Getenv("ROSA_REGIONAL_TEARDOWN_FIRE_AND_FORGET") == "true" {
GinkgoWriter.Printf("Fire-and-forget mode: launching async deletes for infra stacks\n")
fireAndForgetInfraDelete(ROSACTL_BIN, clusterName, region, []string{"cluster-vpc"})
// cleanupCompleted = true
return
}
GinkgoWriter.Printf("Deleting cluster-vpc: %s\n", clusterName)
cmd := exec.Command(ROSACTL_BIN, "cluster-vpc", "delete", clusterName, "--region", region)
cmd.Env = append(os.Environ(), customerEnv()...)
Expand All @@ -856,6 +869,12 @@ var _ = Describe("ROSACTL CLI E2E Tests", Ordered, func() {

It("should be able to delete the cluster-iam", Label("iam-delete", "cleanup"), func() {
defer recordTiming("hcp-iam-delete")()
if os.Getenv("ROSA_REGIONAL_TEARDOWN_FIRE_AND_FORGET") == "true" {
GinkgoWriter.Printf("Fire-and-forget mode: launching async deletes for infra stacks\n")
fireAndForgetInfraDelete(ROSACTL_BIN, clusterName, region, []string{"cluster-iam"})
cleanupCompleted = true
return
}
GinkgoWriter.Printf("Deleting the cluster-iam: %s\n", clusterName)
cmd := exec.Command(ROSACTL_BIN, "cluster-iam", "delete", clusterName, "--region", region)
cmd.Env = append(os.Environ(), customerEnv()...)
Expand Down