SKIP UPGRADE TESTS

Author: Jordan-Williams2

tests/scripts/pre-validation-deploy-ocp-instances.sh

@@ -21,31 +21,27 @@ TF_VARS_FILE="terraform.tfvars"
   # $VALIDATION_APIKEY is available in the catalog runtime
   {
     echo "ibmcloud_api_key=\"${VALIDATION_APIKEY}\""
-    echo "cpd_entitlement_key=\"test-key"
     echo "region=\"${REGION}\""
     echo "prefix=\"ocp-$(openssl rand -hex 2)\""
   } >> ${TF_VARS_FILE}
   terraform apply -input=false -auto-approve -var-file=${TF_VARS_FILE} || exit 1
 
   region_var_name="region"
-  cpd_entitlement_key_var_name="cpd_entitlement_key"
-  cluster_name_var_name="existing_cluster_name"
-  cluster_name_value=$(terraform output -state=terraform.tfstate -raw cluster_name)
-  cluster_resource_group_name_var_name="existing_resource_group_name"
-  cluster_resource_group_name_value=$(terraform output -state=terraform.tfstate -raw cluster_resource_group_name)
+  existing_cluster_name_var_name="existing_cluster_name"
+  existing_cluster_name_value=$(terraform output -state=terraform.tfstate -raw cluster_name)
+  existing_resource_group_name_var_name="existing_resource_group_name"
+  existing_resource_group_name_value=$(terraform output -state=terraform.tfstate -raw cluster_resource_group_name)
 
-  echo "Appending '${cpd_entitlement_key_var_name}', ${cluster_name_var_name}', '${cluster_resource_group_name_var_name}', and '${region_var_name}' input variable values to ${JSON_FILE}.."
+  echo "Appending '${existing_cluster_name_var_name}', '${existing_resource_group_name_var_name}', and '${region_var_name}' input variable values to ${JSON_FILE}.."
 
   cd "${cwd}"
   jq -r --arg region_var_name "${region_var_name}" \
         --arg region_var_value "${REGION}" \
-        --arg cpd_entitlement_key_var_name "${cpd_entitlement_key_var_name}" \
-        --arg cpd_entitlement_key_var_value "${CPD_ENTITLEMENT_KEY}" \
-        --arg cluster_name_var_name "${cluster_name_var_name}" \
-        --arg cluster_name_value "${cluster_name_value}" \
-        --arg cluster_resource_group_name_var_name "${cluster_resource_group_name_var_name}" \
-        --arg cluster_resource_group_name_value "${cluster_resource_group_name_value}" \
-        '. + {($region_var_name): $region_var_value, ($cpd_entitlement_key_var_name): $cpd_entitlement_key_var_value, ($cluster_name_var_name): $cluster_name_value, ($cluster_resource_group_name_var_name): $cluster_resource_group_name_value}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1
+        --arg existing_cluster_name_var_name "${existing_cluster_name_var_name}" \
+        --arg existing_cluster_name_value "${existing_cluster_name_value}" \
+        --arg existing_resource_group_name_var_name "${existing_resource_group_name_var_name}" \
+        --arg existing_resource_group_name_value "${existing_resource_group_name_value}" \
+        '. + {($region_var_name): $region_var_value, ($existing_cluster_name_var_name): $existing_cluster_name_value, ($existing_resource_group_name_var_name): $existing_resource_group_name_value}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1
 
   echo "Pre-validation complete successfully"
 )