Catalog onboarding pipeline configuration

.catalog-onboard-pipeline.yaml

@@ -0,0 +1,24 @@
+---
+apiVersion: v1
+offerings:
+# below is an example of a Deployable Architecture (DA) solution
+- name: IBM Cloud HPC (DA) # must match the offering name in the ibm_catalog.json
+  kind: solution
+  catalog_id: fe9d2e76-5ada-44af-821f-b437dcc80f71
+  offering_id: 468c5a1c-1f1d-4e5a-b5b3-ec646b1bd298
+  # list all of the variations (flavors) you have included in the ibm_catalog.json
+  variations:
+    - name: advanced
+      mark_ready: false # have pipeline mark as visible if validation passes
+      install_type: fullstack # ensure value matches what is in ibm_catalog.json (fullstack or extension)
+      destroy_resources_on_failure: false # defaults to false if not specified so resources can be inspected to debug failures during validation
+      destroy_workspace_on_failure: false # defaults to false if not specified so schematics workspace can be inspected to debug failures during validation
+      import_only: false  # defaults to false - set to true if you do not want to do any validation, but be aware offering can't be publish if not validated
+      validation_rg: validation # the resource group in which to do validation in. Will be created if does not exist. If not specified, default value is 'validation'
+      # scc details needed if your offering is claiming any compliance controls
+      scc:
+        # must be an instance in the same account the validation is being done in
+        instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
+        region: us-south
+      # pre_validation: tests/scripts/pre-validation.sh # optionally run a command before validation runs
+      # post_validation: tests/scripts/post-validation.sh  # optionally run a command after validation completes

.releaserc

@@ -9,7 +9,8 @@
       "assets": "false"
     }],
     ["@semantic-release/exec", {
-      "successCmd": "echo \"SEMVER_VERSION=${nextRelease.version}\" >> $GITHUB_ENV"
+      "successCmd": "echo \"SEMVER_VERSION=${nextRelease.version}\" >> $GITHUB_ENV",
+      "publishCmd": "./ci/trigger-catalog-onboarding-pipeline.sh --version=v${nextRelease.version}"
     }]
   ]
 }

main.tf

@@ -22,13 +22,13 @@ module "hpc" {
   enable_vpn                = var.enable_vpn
   file_shares               = var.file_shares
   hpcs_instance_name        = var.hpcs_instance_name
-  ibm_customer_number       = var.ibm_customer_number
-  ibmcloud_api_key          = var.ibmcloud_api_key
-  key_management            = var.key_management
-  login_image_name          = var.login_image_name
-  login_instances           = var.login_instances
-  login_ssh_keys            = var.login_ssh_keys
-  #login_subnets_cidr       = var.login_subnets_cidr
+  # ibm_customer_number       = var.ibm_customer_number
+  ibmcloud_api_key = var.ibmcloud_api_key
+  key_management   = var.key_management
+  login_image_name = var.login_image_name
+  login_instances  = var.login_instances
+  login_ssh_keys   = var.login_ssh_keys
+  # login_subnets_cidr       = var.login_subnets_cidr
   management_image_name = var.management_image_name
   management_instances  = var.management_instances
   network_cidr          = var.network_cidr

solutions/hpc/catalogValidationValues.json.template

@@ -0,0 +1,10 @@
+{
+  "ibmcloud_api_key": $VALIDATION_APIKEY,
+  "prefix": $PREFIX,
+  "zones": $ZONES,
+  "resource_group": $RG_NAME,
+  "bastion_ssh_keys": $SSH_KEYS,
+  "login_ssh_keys": $SSH_KEYS,
+  "compute_ssh_keys": $SSH_KEYS,
+  "storage_ssh_keys": $SSH_KEYS
+}

solutions/hpc/variables.tf

@@ -14,7 +14,6 @@ variable "storage_type" {
   default     = "scratch"
   description = "Select the required storage type(scratch/persistent/eval)."
 }
-*/
 
 variable "ibm_customer_number" {
   type        = string
@@ -27,7 +26,7 @@ variable "ibm_customer_number" {
     error_message = "The IBM customer number input value cannot have special characters."
   }
 }
-
+*/
 ##############################################################################
 # Account Variables
 ##############################################################################

variables.tf

@@ -14,7 +14,6 @@ variable "storage_type" {
   default     = "scratch"
   description = "Select the required storage type(scratch/persistent/eval)."
 }
-*/
 
 variable "ibm_customer_number" {
   type        = string
@@ -27,7 +26,7 @@ variable "ibm_customer_number" {
     error_message = "The IBM customer number input value cannot have special characters."
   }
 }
-
+*/
 ##############################################################################
 # Account Variables
 ##############################################################################