ci: replace catalog pre-validation with new SSH key replace feature (#837)

ocofaigh · web-flow · commit 2d6d96373aac · 2024-05-21T15:01:12.000+02:00
diff --git a/.catalog-onboard-pipeline.yaml b/.catalog-onboard-pipeline.yaml
@@ -9,14 +9,12 @@ offerings:
       - name: powervs-workspace
         mark_ready: false
         install_type: fullstack
-        pre_validation: "tests/scripts/pre-validation-key-generation.sh solutions/full-stack"
         scc:
           instance_id: d9f6ba0c-dd0e-4348-a834-6002b675fe40
           region: us-south
       - name: powervs-quickstart
         mark_ready: false
         install_type: fullstack
-        pre_validation: "tests/scripts/pre-validation-key-generation.sh solutions/quickstart"
         scc:
           instance_id: d9f6ba0c-dd0e-4348-a834-6002b675fe40
           region: us-south
diff --git a/solutions/full-stack/catalogValidationValues.json.template b/solutions/full-stack/catalogValidationValues.json.template
@@ -4,5 +4,7 @@
   "powervs_resource_group_name": "Automation",
   "prefix": $PREFIX,
   "landing_zone_configuration": "3VPC_RHEL",
-  "external_access_ip": "0.0.0.0/0"
+  "external_access_ip": "0.0.0.0/0",
+  "ssh_public_key": $SSH_PUB_KEY,
+  "ssh_private_key": $SSH_PRV_KEY
 }
diff --git a/solutions/quickstart/catalogValidationValues.json.template b/solutions/quickstart/catalogValidationValues.json.template
@@ -4,5 +4,7 @@
   "prefix": $PREFIX,
   "tshirt_size": "aix_xs",
   "external_access_ip": "0.0.0.0/0",
-  "powervs_resource_group_name": "Automation"
+  "powervs_resource_group_name": "Automation",
+  "ssh_public_key": $SSH_PUB_KEY,
+  "ssh_private_key": $SSH_PRV_KEY
 }
diff --git a/tests/scripts/pre-validation-key-generation.sh b/tests/scripts/pre-validation-key-generation.sh

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,7 @@`
`4`	`4`	`"powervs_resource_group_name": "Automation",`
`5`	`5`	`"prefix": $PREFIX,`
`6`	`6`	`"landing_zone_configuration": "3VPC_RHEL",`
`7`		`- "external_access_ip": "0.0.0.0/0"`
	`7`	`+ "external_access_ip": "0.0.0.0/0",`
	`8`	`+ "ssh_public_key": $SSH_PUB_KEY,`
	`9`	`+ "ssh_private_key": $SSH_PRV_KEY`
`8`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,7 @@`
`4`	`4`	`"prefix": $PREFIX,`
`5`	`5`	`"tshirt_size": "aix_xs",`
`6`	`6`	`"external_access_ip": "0.0.0.0/0",`
`7`		`- "powervs_resource_group_name": "Automation"`
	`7`	`+ "powervs_resource_group_name": "Automation",`
	`8`	`+ "ssh_public_key": $SSH_PUB_KEY,`
	`9`	`+ "ssh_private_key": $SSH_PRV_KEY`
`8`	`10`	`}`