Merge pull request #123 from oracle-quickstart/topic_jcs_13552

abhijit-paranjpe · web-flow · commit 842b0159cf3d · 2022-11-23T09:21:17.000-08:00
Fixed JCS-13552 build script issue with use of BYOL images for UCM su…
diff --git a/builds/build_mp_bundles.sh b/builds/build_mp_bundles.sh
@@ -301,7 +301,7 @@ replace_byol_suite_14110_variables()
 }
 replace_ucm_suite_12214_variables()
 {  
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_byol.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_ucm.tfvars
   get_mp_values
   sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
   sed -i 's/default     = "EE"/default     = "SUITE"/' ${TMP_BUILD}/edition.tf
@@ -314,7 +314,7 @@ replace_ucm_suite_12214_variables()
 }
 replace_ucm_suite_14110_variables()
 { 
-  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_byol.tfvars
+  export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_ucm.tfvars
   get_mp_values
   sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
   sed -i 's/default     = "EE"/default     = "SUITE"/' ${TMP_BUILD}/edition.tf

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ replace_byol_suite_14110_variables()`
`301`	`301`	`}`
`302`	`302`	`replace_ucm_suite_12214_variables()`
`303`	`303`	`{`
`304`		`- export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_byol.tfvars`
	`304`	`+ export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_ucm.tfvars`
`305`	`305`	`get_mp_values`
`306`	`306`	`sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf`
`307`	`307`	`sed -i 's/default = "EE"/default = "SUITE"/' ${TMP_BUILD}/edition.tf`
`@@ -314,7 +314,7 @@ replace_ucm_suite_12214_variables()`
`314`	`314`	`}`
`315`	`315`	`replace_ucm_suite_14110_variables()`
`316`	`316`	`{`
`317`		`- export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_byol.tfvars`
	`317`	`+ export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_ucm.tfvars`
`318`	`318`	`get_mp_values`
`319`	`319`	`sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf`
`320`	`320`	`sed -i 's/default = "EE"/default = "SUITE"/' ${TMP_BUILD}/edition.tf`