fix: fix catalog validation scripts (#572)

terraform-ibm-modules · Mar 29, 2024 · 40a3a41 · 40a3a41
1 parent 74d2966
commit 40a3a41
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/.catalog-onboard-pipeline.yaml b/.catalog-onboard-pipeline.yaml
@@ -31,15 +31,15 @@ offerings:
         mark_ready: true
         install_type: extension
         pre_validation: "tests/scripts/pre-validation-deploy-cos-cross-region.sh"
-        post_validation: "tests/scripts/post-validation-destroy-cos-instance.sh"
+        post_validation: "tests/scripts/post-validation-deploy-cos-cross-region.sh"
         scc:
           instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
           region: us-south
       - name: secure-regional-bucket
         mark_ready: true
         install_type: extension
         pre_validation: "tests/scripts/pre-validation-deploy-cos-regional.sh"
-        post_validation: "tests/scripts/post-validation-destroy-cos-instance.sh"
+        post_validation: "tests/scripts/post-validation-deploy-cos-regional.sh"
         scc:
           instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
           region: us-south
diff --git a/tests/scripts/post-validation-deploy-cos-cross-region.sh b/tests/scripts/post-validation-deploy-cos-cross-region.sh
@@ -0,0 +1,19 @@
+#! /bin/bash
+
+########################################################################################################################
+## This script is used by the catalog pipeline to destroy the COS Instance, which was provisioned as a                ##
+## prerequisite for the cross-region and regional bucket solutions that is published to the catalog                   ##
+########################################################################################################################
+
+set -e
+
+TERRAFORM_SOURCE_DIR="solutions/instance"
+TF_VARS_FILE="terraform-cross-regional.tfvars"
+
+(
+  cd ${TERRAFORM_SOURCE_DIR}
+  echo "Destroying prerequisite COS Instance .."
+  terraform destroy -input=false -auto-approve -var-file=${TF_VARS_FILE} || exit 1
+
+  echo "Post-validation complete successfully"
+)
diff --git a/...s/post-validation-destroy-cos-instance.sh → ...ts/post-validation-deploy-cos-regional.sh b/...s/post-validation-destroy-cos-instance.sh → ...ts/post-validation-deploy-cos-regional.sh
@@ -8,7 +8,7 @@
 set -e
 
 TERRAFORM_SOURCE_DIR="solutions/instance"
-TF_VARS_FILE="terraform.tfvars"
+TF_VARS_FILE="terraform-regional.tfvars"
 
 (
   cd ${TERRAFORM_SOURCE_DIR}