fix: Onboard DA pipeline for tile version

bksagar · Sagar BK · Nupur Goyal · web-flow · commit d151c57b80f4 · 2025-03-05T20:34:40.000+05:30
* Additional changes added to push the new product version

* indentation fix

* Updating the changes from private repo

---------

Co-authored-by: Sagar BK &lt;Sagar.BK1@ibm.com&gt;
Co-authored-by: Nupur Goyal &lt;nupurgoyal@Nupurs-MacBook-Pro.local&gt;
diff --git a/.catalog-onboard-pipeline.yaml b/.catalog-onboard-pipeline.yaml
@@ -2,10 +2,10 @@
 apiVersion: v1
 offerings:
 # below is an example of a Deployable Architecture (DA) solution
-- name: deploy-arch-ibm-hpc # must match the offering name in the ibm_catalog.json
+- name: deploy-arch-ibm-hpc-lsf # must match the offering name in the ibm_catalog.json
   kind: solution
-  catalog_id: 8611e025-10b2-488e-8261-a7f584a5114b
-  offering_id: bf3c07f8-5a62-4289-8ea0-94dbb2b410e6
+  catalog_id: 0d89ec0d-d39a-494d-ac5b-9d940d8cc65f
+  offering_id: 1444e20a-af22-40d1-af98-c880918849cb
   # list all of the variations (flavors) you have included in the ibm_catalog.json
   variations:
     - name: Cluster-with-LSF
diff --git a/.releaserc b/.releaserc
@@ -10,7 +10,7 @@
     }],
     ["@semantic-release/exec", {
       "successCmd": "echo \"SEMVER_VERSION=${nextRelease.version}\" >> $GITHUB_ENV",
-      "publishCmd": "./ci/trigger-catalog-onboarding-pipeline.sh --version=v${nextRelease.version}"
+      "publishCmd": "./ci/trigger-catalog-onboarding-pipeline.sh --version=${nextRelease.version}"
     }]
   ]
 }
diff --git a/.tekton/scripts/common_utils.sh b/.tekton/scripts/common_utils.sh
@@ -62,4 +62,5 @@ ibmcloud plugin install vpc-infrastructure -f
 ibmcloud plugin install dns -f
 ibmcloud plugin install security-compliance -f
 ibmcloud plugin install key-protect -r "IBM Cloud" -f
+ibmcloud plugin install atracker -f
 echo "************************************************"
diff --git a/examples/create_vpc/modules/landing_zone_vpc/datasource.tf b/examples/create_vpc/modules/landing_zone_vpc/datasource.tf
@@ -1,3 +1,3 @@
 data "ibm_resource_group" "itself" {
-  name = var.resource_group
+  name = var.existing_resource_group
 }
diff --git a/examples/create_vpc/modules/landing_zone_vpc/locals.tf b/examples/create_vpc/modules/landing_zone_vpc/locals.tf
@@ -21,7 +21,7 @@ locals {
     var.allowed_cidr
     # var.network_cidr
   ])
-  resource_group_id = var.resource_group != null ? data.ibm_resource_group.itself.id : ""
+  resource_group_id = var.existing_resource_group != null ? data.ibm_resource_group.itself.id : ""
 
   # Region and Zone calculations
   region = join("-", slice(split("-", var.zones[0]), 0, 2))
diff --git a/examples/create_vpc/modules/landing_zone_vpc/variables.tf b/examples/create_vpc/modules/landing_zone_vpc/variables.tf
@@ -13,7 +13,7 @@ variable "ibmcloud_api_key" {
 # Resource Groups Variables
 ##############################################################################
 
-variable "resource_group" {
+variable "existing_resource_group" {
   description = "String describing resource groups to create or reference"
   type        = string
   default     = null
diff --git a/examples/create_vpc/solutions/hpc/main.tf b/examples/create_vpc/solutions/hpc/main.tf
@@ -1,13 +1,13 @@
 module "create_vpc" {
-  source               = "../../modules/landing_zone_vpc"
-  allowed_cidr         = var.remote_allowed_ips
-  ibmcloud_api_key     = var.ibmcloud_api_key
-  ssh_keys             = var.bastion_ssh_keys
-  prefix               = var.cluster_prefix
-  resource_group       = var.resource_group
-  zones                = var.zones
-  network_cidr         = var.vpc_cidr
-  bastion_subnets_cidr = var.vpc_cluster_login_private_subnets_cidr_blocks
-  compute_subnets_cidr = var.vpc_cluster_private_subnets_cidr_blocks
-  enable_hub           = var.enable_hub
+  source                  = "../../modules/landing_zone_vpc"
+  allowed_cidr            = var.remote_allowed_ips
+  ibmcloud_api_key        = var.ibmcloud_api_key
+  ssh_keys                = var.bastion_ssh_keys
+  prefix                  = var.cluster_prefix
+  existing_resource_group = var.existing_resource_group
+  zones                   = var.zones
+  network_cidr            = var.vpc_cidr
+  bastion_subnets_cidr    = var.vpc_cluster_login_private_subnets_cidr_blocks
+  compute_subnets_cidr    = var.vpc_cluster_private_subnets_cidr_blocks
+  enable_hub              = var.enable_hub
 }
diff --git a/examples/create_vpc/solutions/hpc/variables.tf b/examples/create_vpc/solutions/hpc/variables.tf
@@ -16,13 +16,13 @@ variable "ibmcloud_api_key" {
 # Resource Groups Variables
 ##############################################################################
 
-variable "resource_group" {
+variable "existing_resource_group" {
   description = "Resource group name from your IBM Cloud account where the VPC resources should be deployed. Note. If the resource group value is set as null, automation creates two different RG with the name (workload-rg and service-rg). For additional information on resource groups, see [Managing resource groups](https://cloud.ibm.com/docs/account?topic=account-rgs)."
   type        = string
   default     = "Default"
   validation {
-    condition     = var.resource_group != null
-    error_message = "If you want to provide null for resource_group variable, it should be within double quotes."
+    condition     = var.existing_resource_group != null
+    error_message = "If you want to provide null for existing_resource_group variable, it should be within double quotes."
   }
 }
 
diff --git a/ibm_catalog.json b/ibm_catalog.json
@@ -158,18 +158,6 @@
                                     "displayname": "London 3",
                                     "value": ["eu-gb-3"]
                                 },
-                                {
-                                    "displayname": "Frankfurt 1",
-                                    "value": ["eu-de-1"]
-                                },
-                                {
-                                    "displayname": "Frankfurt 2",
-                                    "value": ["eu-de-2"]
-                                },
-                                {
-                                    "displayname": "Frankfurt 3",
-                                    "value": ["eu-de-3"]
-                                },
                                 {
                                     "displayname": "Sydney 1",
                                     "value": ["au-syd-1"]
diff --git a/solutions/hpc/catalogValidationValues.json.template b/solutions/hpc/catalogValidationValues.json.template
@@ -1,7 +1,7 @@
 {
   "ibmcloud_api_key": $VALIDATION_APIKEY,
   "existing_resource_group": $RG_NAME,
-  "reservation_id": $HPC_RESERVATION_ID,
+  "ibm_customer_number": $HPC_IBM_CUSTOMER_NUMBER,
   "cluster_name": "HPC-LSF-1",
   "bastion_ssh_keys": "[\"geretain-hpc\"]",
   "compute_ssh_keys": "[\"geretain-hpc\"]",

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}],`
`11`	`11`	`["@semantic-release/exec", {`
`12`	`12`	`"successCmd": "echo \"SEMVER_VERSION=${nextRelease.version}\" >> $GITHUB_ENV",`
`13`		`- "publishCmd": "./ci/trigger-catalog-onboarding-pipeline.sh --version=v${nextRelease.version}"`
	`13`	`+ "publishCmd": "./ci/trigger-catalog-onboarding-pipeline.sh --version=${nextRelease.version}"`
`14`	`14`	`}]`
`15`	`15`	`]`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`data "ibm_resource_group" "itself" {`
`2`		`- name = var.resource_group`
	`2`	`+ name = var.existing_resource_group`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"ibmcloud_api_key": $VALIDATION_APIKEY,`
`3`	`3`	`"existing_resource_group": $RG_NAME,`
`4`		`- "reservation_id": $HPC_RESERVATION_ID,`
	`4`	`+ "ibm_customer_number": $HPC_IBM_CUSTOMER_NUMBER,`
`5`	`5`	`"cluster_name": "HPC-LSF-1",`
`6`	`6`	`"bastion_ssh_keys": "[\"geretain-hpc\"]",`
`7`	`7`	`"compute_ssh_keys": "[\"geretain-hpc\"]",`