chore(deps): update ci dependencies (#797)

terraform-ibm-modules-ops · stafaniasaju · web-flow · commit ee066029107e · 2025-03-24T20:05:27.000+01:00
* chore(deps): update terraform ibm to latest for deployable architectures

* chore(deps): update ci dependencies

* chore: updated terratest

* chore: adjust prefix length

* chore: sub-module updates

---------

Co-authored-by: stafaniasaju &lt;stafania.saju@ibm.com&gt;
diff --git a/common-dev-assets b/common-dev-assets
@@ -1 +1 @@
-Subproject commit 2f8bedb6f5e623405e41553b0491c0306a027023
+Subproject commit 746dc8bdcd148e0a1eff04fdfc2da774dba4a784
diff --git a/modules/pi-sap-system-type1/README.md b/modules/pi-sap-system-type1/README.md
@@ -35,10 +35,10 @@ The Power Virtual Server for SAP module automates the following tasks:
 | <a name="module_ansible_sap_instance_init"></a> [ansible\_sap\_instance\_init](#module\_ansible\_sap\_instance\_init) | ../ansible | n/a |
 | <a name="module_ansible_sharefs_instance_exportfs"></a> [ansible\_sharefs\_instance\_exportfs](#module\_ansible\_sharefs\_instance\_exportfs) | ../ansible | n/a |
 | <a name="module_configure_scc_wp_agent"></a> [configure\_scc\_wp\_agent](#module\_configure\_scc\_wp\_agent) | ..//ansible | n/a |
-| <a name="module_pi_hana_instance"></a> [pi\_hana\_instance](#module\_pi\_hana\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.5.1 |
+| <a name="module_pi_hana_instance"></a> [pi\_hana\_instance](#module\_pi\_hana\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.5.2 |
 | <a name="module_pi_hana_storage_calculation"></a> [pi\_hana\_storage\_calculation](#module\_pi\_hana\_storage\_calculation) | ../pi-hana-storage-config | n/a |
-| <a name="module_pi_netweaver_instance"></a> [pi\_netweaver\_instance](#module\_pi\_netweaver\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.5.1 |
-| <a name="module_pi_sharefs_instance"></a> [pi\_sharefs\_instance](#module\_pi\_sharefs\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.5.1 |
+| <a name="module_pi_netweaver_instance"></a> [pi\_netweaver\_instance](#module\_pi\_netweaver\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.5.2 |
+| <a name="module_pi_sharefs_instance"></a> [pi\_sharefs\_instance](#module\_pi\_sharefs\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.5.2 |
 
 ### Resources
 
diff --git a/modules/pi-sap-system-type1/main.tf b/modules/pi-sap-system-type1/main.tf
@@ -40,7 +40,7 @@ locals {
 
 module "pi_sharefs_instance" {
   source  = "terraform-ibm-modules/powervs-instance/ibm"
-  version = "2.5.1"
+  version = "2.5.2"
   count   = var.pi_sharefs_instance.enable ? 1 : 0
 
   pi_workspace_guid          = var.pi_workspace_guid
@@ -116,7 +116,7 @@ module "pi_hana_storage_calculation" {
 
 module "pi_hana_instance" {
   source  = "terraform-ibm-modules/powervs-instance/ibm"
-  version = "2.5.1"
+  version = "2.5.2"
 
   pi_workspace_guid          = var.pi_workspace_guid
   pi_instance_name           = local.pi_hana_instance_name
@@ -156,7 +156,7 @@ resource "time_sleep" "wait_1_min" {
 
 module "pi_netweaver_instance" {
   source     = "terraform-ibm-modules/powervs-instance/ibm"
-  version    = "2.5.1"
+  version    = "2.5.2"
   count      = var.pi_netweaver_instance.instance_count
   depends_on = [time_sleep.wait_1_min]
 
diff --git a/solutions/e2e/README.md b/solutions/e2e/README.md
@@ -52,14 +52,14 @@ The end-to-end solution automates the following tasks:
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
-| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.76.1 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.76.2 |
 | <a name="requirement_time"></a> [time](#requirement\_time) | 0.13.0 |
 
 ### Modules
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_powervs_infra"></a> [powervs\_infra](#module\_powervs\_infra) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 8.2.1 |
+| <a name="module_powervs_infra"></a> [powervs\_infra](#module\_powervs\_infra) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 8.2.2 |
 | <a name="module_sap_system"></a> [sap\_system](#module\_sap\_system) | ../../modules/pi-sap-system-type1 | n/a |
 
 ### Resources
diff --git a/solutions/e2e/main.tf b/solutions/e2e/main.tf
@@ -7,7 +7,7 @@
 
 module "powervs_infra" {
   source  = "terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone"
-  version = "8.2.1"
+  version = "8.2.2"
 
   providers = { ibm.ibm-is = ibm.ibm-is, ibm.ibm-pi = ibm.ibm-pi, ibm.ibm-sm = ibm.ibm-sm }
 
diff --git a/solutions/e2e/version.tf b/solutions/e2e/version.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.76.1"
+      version = "1.76.2"
     }
     time = {
       source  = "hashicorp/time"
diff --git a/solutions/ibm-catalog/sap-ready-to-go/README.md b/solutions/ibm-catalog/sap-ready-to-go/README.md
@@ -46,7 +46,7 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
-| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.76.1 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.76.2 |
 
 ### Modules
 
@@ -58,10 +58,10 @@
 
 | Name | Type |
 |------|------|
-| [ibm_pi_image.powervs_hana_os_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.1/docs/data-sources/pi_image) | data source |
-| [ibm_pi_image.powervs_netweaver_os_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.1/docs/data-sources/pi_image) | data source |
-| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.1/docs/data-sources/schematics_output) | data source |
-| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.1/docs/data-sources/schematics_workspace) | data source |
+| [ibm_pi_image.powervs_hana_os_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.2/docs/data-sources/pi_image) | data source |
+| [ibm_pi_image.powervs_netweaver_os_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.2/docs/data-sources/pi_image) | data source |
+| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.2/docs/data-sources/schematics_output) | data source |
+| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.2/docs/data-sources/schematics_workspace) | data source |
 
 ### Inputs
 
diff --git a/solutions/ibm-catalog/sap-ready-to-go/version.tf b/solutions/ibm-catalog/sap-ready-to-go/version.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.76.1"
+      version = "1.76.2"
     }
   }
 }
diff --git a/solutions/ibm-catalog/sap-s4hana-bw4hana/README.md b/solutions/ibm-catalog/sap-s4hana-bw4hana/README.md
@@ -139,7 +139,7 @@ S4HANA_2023
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
-| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.76.1 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.76.2 |
 
 ### Modules
 
@@ -157,10 +157,10 @@ S4HANA_2023
 
 | Name | Type |
 |------|------|
-| [ibm_pi_image.powervs_hana_os_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.1/docs/data-sources/pi_image) | data source |
-| [ibm_pi_image.powervs_netweaver_os_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.1/docs/data-sources/pi_image) | data source |
-| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.1/docs/data-sources/schematics_output) | data source |
-| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.1/docs/data-sources/schematics_workspace) | data source |
+| [ibm_pi_image.powervs_hana_os_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.2/docs/data-sources/pi_image) | data source |
+| [ibm_pi_image.powervs_netweaver_os_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.2/docs/data-sources/pi_image) | data source |
+| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.2/docs/data-sources/schematics_output) | data source |
+| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.2/docs/data-sources/schematics_workspace) | data source |
 
 ### Inputs
 
diff --git a/solutions/ibm-catalog/sap-s4hana-bw4hana/version.tf b/solutions/ibm-catalog/sap-s4hana-bw4hana/version.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.76.1"
+      version = "1.76.2"
     }
   }
 }
diff --git a/solutions/sap-ready-to-go/README.md b/solutions/sap-ready-to-go/README.md
@@ -38,7 +38,7 @@ The 'sap-ready-to-go' solution automates the following tasks:
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9.0 |
-| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.76.1 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.76.2 |
 
 ### Modules
 
@@ -50,8 +50,8 @@ The 'sap-ready-to-go' solution automates the following tasks:
 
 | Name | Type |
 |------|------|
-| [ibm_pi_image.powervs_hana_os_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.1/docs/data-sources/pi_image) | data source |
-| [ibm_pi_image.powervs_netweaver_os_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.1/docs/data-sources/pi_image) | data source |
+| [ibm_pi_image.powervs_hana_os_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.2/docs/data-sources/pi_image) | data source |
+| [ibm_pi_image.powervs_netweaver_os_image](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.2/docs/data-sources/pi_image) | data source |
 
 ### Inputs
 
diff --git a/solutions/sap-ready-to-go/version.tf b/solutions/sap-ready-to-go/version.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.76.1"
+      version = "1.76.2"
     }
   }
 }
diff --git a/tests/common-go-assets/cloudinfo-region-power-prefs.yaml b/tests/common-go-assets/cloudinfo-region-power-prefs.yaml
diff --git a/tests/pr_test.go b/tests/pr_test.go
@@ -34,34 +34,17 @@ func TestMain(m *testing.M) {
 	os.Exit(m.Run())
 }
 
-func setupOptions(t *testing.T, prefix string) *testhelper.TestOptions {
+func setupOptions(t *testing.T, prefix string, powervs_zone string) *testhelper.TestOptions {
 
 	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
-		Testing:            t,
-		TerraformDir:       defaultExampleTerraformDir,
-		Prefix:             prefix,
-		ResourceGroup:      resourceGroup,
-		Region:             "eu-de-2", // specify default region to skip best choice query
-		DefaultRegion:      "eu-de-2",
-		BestRegionYAMLPath: "./common-go-assets/cloudinfo-region-power-prefs.yaml", // specific to powervs zones
-		// temporary workaround for BSS backend issue
-		ImplicitDestroy: []string{
-			"module.fullstack.module.landing_zone.module.landing_zone.ibm_resource_group.resource_groups",
-		},
+		Testing:       t,
+		TerraformDir:  defaultExampleTerraformDir,
+		Prefix:        prefix,
+		ResourceGroup: resourceGroup,
+		Region:        powervs_zone,
 	})
 
-	// query for best zone to deploy powervs example, based on current connection count
-	// NOTE: this is why we do not want to run multiple tests in parallel.
-	options.Region, _ = testhelper.GetBestPowerSystemsRegionO(options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], options.BestRegionYAMLPath, options.DefaultRegion,
-		testhelper.TesthelperTerraformOptions{CloudInfoService: sharedInfoSvc})
-	// if for any reason the region is empty at this point, such as error, use default
-	if len(options.Region) == 0 {
-		options.Region = options.DefaultRegion
-	}
-
 	options.TerraformVars = map[string]interface{}{
-		// locking into syd04 due to other data center issues
-		//"powervs_zone": "syd04",
 		"powervs_zone":                options.Region,
 		"prefix":                      options.Prefix,
 		"powervs_resource_group_name": options.ResourceGroup,
@@ -73,10 +56,12 @@ func setupOptions(t *testing.T, prefix string) *testhelper.TestOptions {
 	return options
 }
 
+// IMPORTANT: Keep the prefix length unchanged; it appends to an auto-generated string.
+
 func TestRunBranchExample(t *testing.T) {
 	t.Parallel()
 
-	options := setupOptions(t, "s")
+	options := setupOptions(t, "b", "tor01")
 
 	output, err := options.RunTestConsistency()
 	assert.Nil(t, err, "This should not have errored")
@@ -85,7 +70,7 @@ func TestRunBranchExample(t *testing.T) {
 
 func TestRunMainExample(t *testing.T) {
 	t.Parallel()
-	options := setupOptions(t, "s")
+	options := setupOptions(t, "m", "tok04")
 
 	output, err := options.RunTestUpgrade()
 	if !options.UpgradeTestSkipped {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ terraform {`
`3`	`3`	`required_providers {`
`4`	`4`	`ibm = {`
`5`	`5`	`source = "IBM-Cloud/ibm"`
`6`		`- version = "1.76.1"`
	`6`	`+ version = "1.76.2"`
`7`	`7`	`}`
`8`	`8`	`time = {`
`9`	`9`	`source = "hashicorp/time"`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ terraform {`
`7`	`7`	`required_providers {`
`8`	`8`	`ibm = {`
`9`	`9`	`source = "IBM-Cloud/ibm"`
`10`		`- version = "1.76.1"`
	`10`	`+ version = "1.76.2"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`}`