Skip to content

Commit

Permalink
fix: updated catalog validation to make inventory repo null, so trigg…
Browse files Browse the repository at this point in the history
…er will be skipped in test (#32)
  • Loading branch information
brendankellyibm authored Apr 19, 2024
1 parent 5748734 commit e00bcfb
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions tests/scripts/pre-validation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ TF_VARS_FILE="terraform.tfvars"
watson_machine_learning_instance_resource_name_var_name="watson_machine_learning_instance_resource_name"
use_existing_resource_group_var_name="use_existing_resource_group"
create_continuous_delivery_service_instance_var_name="create_continuous_delivery_service_instance"
inventory_repo_url_var_name="inventory_repo_url"
secrets_manager_guid_var_name="secrets_manager_guid"
secrets_manager_crn_var_name="secrets_manager_crn"
signing_key_payload_var_name="signing_key_payload"
Expand All @@ -57,7 +56,6 @@ TF_VARS_FILE="terraform.tfvars"
watson_machine_learning_instance_resource_name_value=$(terraform output -state=terraform.tfstate -raw watson_machine_learning_instance_resource_name)
use_existing_resource_group_value=true
create_continuous_delivery_service_instance_value=false
inventory_repo_url_value="https://${REGION}.git.cloud.ibm.com/test-inventory-repo"
secrets_manager_guid_value=$(terraform output -state=terraform.tfstate -raw secrets_manager_guid)
secrets_manager_crn_value=$(terraform output -state=terraform.tfstate -raw secrets_manager_crn)
signing_key_payload_value=$(terraform output -state=terraform.tfstate -raw signing_key_payload)
Expand Down Expand Up @@ -95,8 +93,6 @@ TF_VARS_FILE="terraform.tfvars"
--arg use_existing_resource_group_value "${use_existing_resource_group_value}" \
--arg create_continuous_delivery_service_instance_var_name "${create_continuous_delivery_service_instance_var_name}" \
--arg create_continuous_delivery_service_instance_value "${create_continuous_delivery_service_instance_value}" \
--arg inventory_repo_url_var_name "${inventory_repo_url_var_name}" \
--arg inventory_repo_url_value "${inventory_repo_url_value}" \
--arg secrets_manager_crn_var_name "${secrets_manager_crn_var_name}" \
--arg secrets_manager_crn_value "${secrets_manager_crn_value}" \
--arg secrets_manager_guid_var_name "${secrets_manager_guid_var_name}" \
Expand All @@ -120,8 +116,7 @@ TF_VARS_FILE="terraform.tfvars"
($watson_machine_learning_instance_resource_name_var_name): $watson_machine_learning_instance_resource_name_value,
($secrets_manager_crn_var_name): $secrets_manager_crn_value,
($secrets_manager_guid_var_name): $secrets_manager_guid_value,
($signing_key_payload_var_name): $signing_key_payload_value,
($inventory_repo_url_var_name): $inventory_repo_url_value}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1
($signing_key_payload_var_name): $signing_key_payload_value' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1

echo "Pre-validation complete successfully"
)

0 comments on commit e00bcfb

Please sign in to comment.