Skip to content

test: remove workaround #131

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+7 −9
Open

test: remove workaround #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5802af6
test: remove workaround
ocofaigh Jun 14, 2024
c857bfb
Merge branch 'main' into rm-wr
ocofaigh Jun 17, 2024
ba7577c
Update main.tf
ocofaigh Jun 20, 2024
f879e8e
Merge branch 'main' into rm-wr
ocofaigh Aug 2, 2024
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
3 changes: 0 additions & 3 deletions tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,6 @@ func TestRunDAManage(t *testing.T) {
return
}

// Workaround for https://github.com/terraform-ibm-modules/terraform-ibm-mas/issues/78
// defer terraform.Destroy(t, preReqOptions)
defer func() {
// Check if "DO_NOT_DESTROY_ON_FAILURE" is set
envVal, _ := os.LookupEnv("DO_NOT_DESTROY_ON_FAILURE")
Expand All @@ -173,7 +171,6 @@ func TestRunDAManage(t *testing.T) {
if options.Testing.Failed() && strings.ToLower(envVal) == "true" {
fmt.Println("Terratest failed. Debug the Test and delete resources manually.")
} else {
terraform.RunTerraformCommand(t, preReqOptions, "state", "rm", "module.landing_zone.module.landing_zone.ibm_resource_group.resource_groups[\"workload-rg\"]")
terraform.Destroy(t, preReqOptions)
}
}()
Expand Down
13 changes: 7 additions & 6 deletions tests/resources/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
##############################################################################

module "landing_zone" {
source = "terraform-ibm-modules/landing-zone/ibm//patterns//roks//module"
version = "5.22.0"
region = var.region
prefix = var.prefix
tags = var.resource_tags
override = true
source = "terraform-ibm-modules/landing-zone/ibm//patterns//roks//module"
version = "5.24.7"
region = var.region
prefix = var.prefix
tags = var.resource_tags
cluster_force_delete_storage = true # delete sotrage created by tests
override = true
}