From f74d1e466015f1dc3d1be602aad7eb224a726710 Mon Sep 17 00:00:00 2001 From: surajsbharadwaj Date: Wed, 14 May 2025 10:57:13 +0200 Subject: [PATCH 1/2] fix: upgrade tf provider version SKIP UPGRADE TEST: network retry --- .secrets.baseline | 4 ++-- ibm_catalog.json | 6 +++--- .../deploy-arch-ibm-pvs-inf-standard-extend.md | 6 +++--- .../deploy-arch-ibm-pvs-inf-standard-plus-vsi.md | 6 +++--- .../standard/deploy-arch-ibm-pvs-inf-standard.md | 6 +++--- solutions/standard-extend/README.md | 6 +++--- solutions/standard-extend/versions.tf | 2 +- solutions/standard-plus-vsi/README.md | 4 ++-- solutions/standard-plus-vsi/versions.tf | 2 +- solutions/standard/README.md | 2 +- solutions/standard/versions.tf | 2 +- tests/pr_test.go | 16 ++++++---------- 12 files changed, 29 insertions(+), 33 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index e56527fd..e32538ac 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "go.sum|^.secrets.baseline$", "lines": null }, - "generated_at": "2025-05-07T12:39:51Z", + "generated_at": "2025-05-14T08:56:32Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -136,7 +136,7 @@ "hashed_secret": "fa501f2ceec739604d621b521446b88d41a7f76b", "is_secret": false, "is_verified": false, - "line_number": 85, + "line_number": 81, "type": "Secret Keyword", "verified_result": null } diff --git a/ibm_catalog.json b/ibm_catalog.json index 06bb1368..89521364 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -560,7 +560,7 @@ { "diagram": { "caption": "Power Virtual Server with VPC landing zone 'Standard Landscape' variation", - "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.4.1/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.svg", + "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.4.2/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.svg", "type": "image/svg+xml" }, "description": "The Power Virtual Server with VPC landing zone as variation 'Create a new architecture' deploys VPC services and a Power Virtual Server workspace and interconnects them.\n \nRequired and optional management components are configured." @@ -1221,7 +1221,7 @@ { "diagram": { "caption": "Power Virtual Server with VPC landing zone 'Quickstart' variation", - "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.4.1/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.svg", + "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.4.2/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.svg", "type": "image/svg+xml" }, "description": "The Power Virtual Server with VPC landing zone as 'Quickstart' variation of 'Create a new architecture' option deploys VPC services and a Power Virtual Server workspace and interconnects them. It also creates one Power virtual server instance of chosen t-shirt size or custom configuration.\n \nRequired and optional management components are configured." @@ -1548,7 +1548,7 @@ { "diagram": { "caption": "Power Virtual Server with VPC landing zone 'Extend Standard Landscape' variation", - "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.4.1/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.svg", + "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.4.2/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.svg", "type": "image/svg+xml" }, "description": "The Power Virtual Server with VPC landing zone as variation 'Extend Power Virtual Server with VPC landing zone' creates an additional Power Virtual Server workspace and connects it with already created Power Virtual Server with VPC landing zone. It builds on existing Power Virtual Server with VPC landing zone deployed as a variation 'Create a new architecture'." diff --git a/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md b/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md index c256387e..ce71cfc9 100644 --- a/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md +++ b/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md @@ -1,7 +1,7 @@ --- copyright: years: 2024, 2025 -lastupdated: "2025-05-08" +lastupdated: "2025-05-14" keywords: subcollection: deployable-reference-architectures authors: @@ -15,7 +15,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf use-case: ITServiceManagement industry: Technology content-type: reference-architecture -version: v8.4.1 +version: v8.4.2 compliance: SAPCertified --- @@ -28,7 +28,7 @@ compliance: SAPCertified {: toc-industry="Technology"} {: toc-use-case="ITServiceManagement"} {: toc-compliance="SAPCertified"} -{: toc-version="v8.4.1"} +{: toc-version="v8.4.2"} The Power Virtual Server with VPC landing zone as variation 'Extend Power Virtual Server with VPC landing zone' creates an additional Power Virtual Server workspace and connects it with the already created Power Virtual Server with VPC landing zone. It builds on the existing Power Virtual Server with VPC landing zone deployed as a variation 'Create a new architecture'. diff --git a/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md b/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md index 50398e85..322e9293 100644 --- a/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md +++ b/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md @@ -1,7 +1,7 @@ --- copyright: years: 2024, 2025 -lastupdated: "2025-05-08" +lastupdated: "2025-05-14" keywords: subcollection: deployable-reference-architectures authors: @@ -16,7 +16,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf use-case: ITServiceManagement industry: Technology content-type: reference-architecture -version: v8.4.1 +version: v8.4.2 compliance: --- @@ -28,7 +28,7 @@ compliance: {: toc-content-type="reference-architecture"} {: toc-industry="Technology"} {: toc-use-case="ITServiceManagement"} -{: toc-version="v8.4.1"} +{: toc-version="v8.4.2"} Quickstart deployment of the Power Virtual Server with VPC landing zone creates VPC services, a Power Virtual Server workspace, and interconnects them. It also deploys a Power Virtual Server of chosen T-shirt size or custom configuration. Supported Os are Aix, IBM i, and Linux images. diff --git a/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md b/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md index 65d2e596..8bb8cf74 100644 --- a/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md +++ b/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md @@ -1,7 +1,7 @@ --- copyright: years: 2024, 2025 -lastupdated: "2025-05-08" +lastupdated: "2025-05-14" keywords: subcollection: deployable-reference-architectures authors: @@ -15,7 +15,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf use-case: ITServiceManagement industry: Technology content-type: reference-architecture -version: v8.4.1 +version: v8.4.2 compliance: SAPCertified --- @@ -28,7 +28,7 @@ compliance: SAPCertified {: toc-industry="Technology"} {: toc-use-case="ITServiceManagement"} {: toc-compliance="SAPCertified"} -{: toc-version="v8.4.1"} +{: toc-version="v8.4.2"} The Standard deployment of the Power Virtual Server with VPC landing zone creates VPC services and a Power Virtual Server workspace and interconnects them. diff --git a/solutions/standard-extend/README.md b/solutions/standard-extend/README.md index e3b8b3ba..0a9314e4 100644 --- a/solutions/standard-extend/README.md +++ b/solutions/standard-extend/README.md @@ -36,7 +36,7 @@ If you do not have a PowerVS infrastructure that is the [Standard Landscape Vari | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.9 | -| [ibm](#requirement\_ibm) | 1.78.1 | +| [ibm](#requirement\_ibm) | 1.78.2 | ### Modules @@ -48,8 +48,8 @@ If you do not have a PowerVS infrastructure that is the [Standard Landscape Vari | Name | Type | |------|------| -| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.78.1/docs/data-sources/schematics_output) | data source | -| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.78.1/docs/data-sources/schematics_workspace) | data source | +| [ibm_schematics_output.schematics_output](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.78.2/docs/data-sources/schematics_output) | data source | +| [ibm_schematics_workspace.schematics_workspace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.78.2/docs/data-sources/schematics_workspace) | data source | ### Inputs diff --git a/solutions/standard-extend/versions.tf b/solutions/standard-extend/versions.tf index 7c9a6ee2..79a594b6 100644 --- a/solutions/standard-extend/versions.tf +++ b/solutions/standard-extend/versions.tf @@ -7,7 +7,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.78.1" + version = "1.78.2" } } } diff --git a/solutions/standard-plus-vsi/README.md b/solutions/standard-plus-vsi/README.md index 7f1d353e..cb0bfb77 100644 --- a/solutions/standard-plus-vsi/README.md +++ b/solutions/standard-plus-vsi/README.md @@ -47,7 +47,7 @@ This example sets up the following infrastructure: | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.9 | -| [ibm](#requirement\_ibm) | 1.78.1 | +| [ibm](#requirement\_ibm) | 1.78.2 | ### Modules @@ -60,7 +60,7 @@ This example sets up the following infrastructure: | Name | Type | |------|------| -| [ibm_pi_catalog_images.catalog_images_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.78.1/docs/data-sources/pi_catalog_images) | data source | +| [ibm_pi_catalog_images.catalog_images_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.78.2/docs/data-sources/pi_catalog_images) | data source | ### Inputs diff --git a/solutions/standard-plus-vsi/versions.tf b/solutions/standard-plus-vsi/versions.tf index 0f85cc3c..67850b51 100644 --- a/solutions/standard-plus-vsi/versions.tf +++ b/solutions/standard-plus-vsi/versions.tf @@ -7,7 +7,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.78.1" + version = "1.78.2" } } } diff --git a/solutions/standard/README.md b/solutions/standard/README.md index 1c01e539..9f537e90 100644 --- a/solutions/standard/README.md +++ b/solutions/standard/README.md @@ -47,7 +47,7 @@ This example sets up the following infrastructure: | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.9 | -| [ibm](#requirement\_ibm) | 1.78.1 | +| [ibm](#requirement\_ibm) | 1.78.2 | ### Modules diff --git a/solutions/standard/versions.tf b/solutions/standard/versions.tf index b07dccdf..8caf6958 100644 --- a/solutions/standard/versions.tf +++ b/solutions/standard/versions.tf @@ -7,7 +7,7 @@ terraform { required_providers { ibm = { source = "IBM-Cloud/ibm" - version = "1.78.1" + version = "1.78.2" } } } diff --git a/tests/pr_test.go b/tests/pr_test.go index 694bbc7b..0c73b790 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -55,16 +55,12 @@ func TestMain(m *testing.M) { func setupOptionsStandardSolution(t *testing.T, prefix string, powervs_zone string) *testhelper.TestOptions { options := testhelper.TestOptionsDefault(&testhelper.TestOptions{ - Testing: t, - TerraformDir: defaultExampleTerraformDir, - Prefix: prefix, - ResourceGroup: resourceGroup, - Region: powervs_zone, - ImplicitDestroy: []string{ - "module.standard.module.powervs_workspace.ibm_resource_instance.pi_workspace", - "module.standard.module.powervs_workspace.ibm_pi_network.private_subnet_1[0]", - "module.standard.module.powervs_workspace.ibm_pi_network.private_subnet_2[0]", - }, + Testing: t, + TerraformDir: defaultExampleTerraformDir, + Prefix: prefix, + ResourceGroup: resourceGroup, + Region: powervs_zone, + ImplicitDestroy: []string{}, }) options.TerraformVars = map[string]interface{}{ From 0e4e52ee77904a969ee0a986aabbdb74cb11ec25 Mon Sep 17 00:00:00 2001 From: surajsbharadwaj Date: Wed, 14 May 2025 12:18:38 +0200 Subject: [PATCH 2/2] chore: disable monitoring host SKIP UPGRADE TEST: network retry --- tests/pr_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pr_test.go b/tests/pr_test.go index 0c73b790..23ae783e 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -76,7 +76,7 @@ func setupOptionsStandardSolution(t *testing.T, prefix string, powervs_zone stri "existing_sm_instance_guid": permanentResources["secretsManagerGuid"], "existing_sm_instance_region": permanentResources["secretsManagerRegion"], "certificate_template_name": permanentResources["privateCertTemplateName"], - "enable_monitoring": true, + "enable_monitoring": false, "enable_scc_wp": true, "ansible_vault_password": "SecurePassw0rd!", }