Skip to content

Commit 9462be8

Browse files
skommalatelake
skommala
and
telake
authored
Topic sk jcs 13594 (#162)
Fix jiras JCS-13594 and JCS-13635 Co-authored-by: telake <[email protected]>
1 parent 5d27b2a commit 9462be8

File tree

11 files changed

+419
-419
lines changed

11 files changed

+419
-419
lines changed

‎builds/build_cli.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Copyright (c) 2022, Oracle and/or its affiliates.
2-
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
3-
41
#!/usr/bin/env bash
52

3+
# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
4+
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
5+
66
############################################################
77
# Build CLI bundle to run SRG dev tests #
88
############################################################
@@ -68,7 +68,7 @@ mkdir -p ${SCRIPT_DIR}/binaries/tmpbuild
6868

6969
create_cli_bundle()
7070
{
71-
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/edition.tf ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/inputs ${TMP_BUILD}
71+
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/edition.tf ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/images ${TMP_BUILD}
7272
replace_variables
7373
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-terraform.zip *; rm -Rf ${TMP_BUILD}/*)
7474
}

‎builds/build_mp_bundles.sh‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Copyright (c) 2022, Oracle and/or its affiliates.
2-
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
3-
41
#!/usr/bin/env bash
52

3+
# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
4+
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
5+
66
############################################################
77
# help #
88
############################################################
@@ -186,7 +186,7 @@ create_byol_standard_14110()
186186

187187
replace_byol_ee_12214_variables()
188188
{
189-
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_byol.tfvars
189+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
190190
get_mp_values
191191
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
192192
sed -i '/variable "instance_image_id" {/!b;n;n;n;cdefault = '"$instance_image_id"'' ${TMP_BUILD}/mp_variables.tf
@@ -206,7 +206,7 @@ replace_byol_ee_12214_variables()
206206
}
207207
replace_byol_ee_14110_variables()
208208
{
209-
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_byol.tfvars
209+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
210210
get_mp_values
211211
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
212212
sed -i '/variable "wls_version" {/!b;n;n;n;cdefault = \"14.1.1.0\"' ${TMP_BUILD}/weblogic_variables.tf
@@ -227,7 +227,7 @@ replace_byol_ee_14110_variables()
227227
}
228228
replace_byol_se_12214_variables()
229229
{
230-
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_se_byol.tfvars
230+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_se_byol.tfvars
231231
get_mp_values
232232
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
233233
sed -i 's/default = "EE"/default = "SE"/' ${TMP_BUILD}/edition.tf
@@ -239,13 +239,13 @@ replace_byol_se_12214_variables()
239239
sed -i 's/#- ${use_autoscaling}/- ${use_autoscaling}/' ${TMP_BUILD}/schema.yaml
240240
sed -i ':a;$!{N;ba};s/- ${use_autoscaling}/#- ${use_autoscaling}/1' ${TMP_BUILD}/schema.yaml
241241
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
242-
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_byol.tfvars
242+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
243243
get_mp_values
244244
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
245245
}
246246
replace_byol_se_14110_variables()
247247
{
248-
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_se_byol.tfvars
248+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_se_byol.tfvars
249249
get_mp_values
250250
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
251251
sed -i 's/default = "EE"/default = "SE"/' ${TMP_BUILD}/edition.tf
@@ -258,13 +258,13 @@ replace_byol_se_14110_variables()
258258
sed -i 's/#- ${use_autoscaling}/- ${use_autoscaling}/' ${TMP_BUILD}/schema_14110.yaml
259259
sed -i ':a;$!{N;ba};s/- ${use_autoscaling}/#- ${use_autoscaling}/1' ${TMP_BUILD}/schema_14110.yaml
260260
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
261-
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_byol.tfvars
261+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
262262
get_mp_values
263263
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
264264
}
265265
replace_byol_suite_12214_variables()
266266
{
267-
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_byol.tfvars
267+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_byol.tfvars
268268
get_mp_values
269269
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
270270
sed -i 's/default = "EE"/default = "SUITE"/' ${TMP_BUILD}/edition.tf
@@ -285,7 +285,7 @@ replace_byol_suite_12214_variables()
285285
}
286286
replace_byol_suite_14110_variables()
287287
{
288-
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_byol.tfvars
288+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_byol.tfvars
289289
get_mp_values
290290
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
291291
sed -i 's/default = "EE"/default = "SUITE"/' ${TMP_BUILD}/edition.tf
@@ -307,7 +307,7 @@ replace_byol_suite_14110_variables()
307307
}
308308
replace_ucm_suite_12214_variables()
309309
{
310-
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_ucm.tfvars
310+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_ucm.tfvars
311311
get_mp_values
312312
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
313313
sed -i 's/default = "EE"/default = "SUITE"/' ${TMP_BUILD}/edition.tf
@@ -317,13 +317,13 @@ replace_ucm_suite_12214_variables()
317317
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
318318
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema.yaml
319319
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
320-
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_byol.tfvars
320+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_byol.tfvars
321321
get_mp_values
322322
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
323323
}
324324
replace_ucm_suite_14110_variables()
325325
{
326-
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_ucm.tfvars
326+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_ucm.tfvars
327327
get_mp_values
328328
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
329329
sed -i 's/default = "EE"/default = "SUITE"/' ${TMP_BUILD}/edition.tf
@@ -334,13 +334,13 @@ replace_ucm_suite_14110_variables()
334334
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
335335
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_14110.yaml
336336
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
337-
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_suite_byol.tfvars
337+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_byol.tfvars
338338
get_mp_values
339339
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
340340
}
341341
replace_ucm_ee_12214_variables()
342342
{
343-
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_ucm.tfvars
343+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_ucm.tfvars
344344
get_mp_values
345345
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
346346
sed -i '/variable "instance_image_id" {/!b;n;n;n;cdefault = '"$instance_image_id"'' ${TMP_BUILD}/mp_variables.tf
@@ -349,13 +349,13 @@ replace_ucm_ee_12214_variables()
349349
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
350350
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema.yaml
351351
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
352-
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_byol.tfvars
352+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
353353
get_mp_values
354354
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
355355
}
356356
replace_ucm_ee_14110_variables()
357357
{
358-
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_ucm.tfvars
358+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_ucm.tfvars
359359
get_mp_values
360360
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
361361
sed -i '/variable "wls_version" {/!b;n;n;n;cdefault = \"14.1.1.0\"' ${TMP_BUILD}/weblogic_variables.tf
@@ -365,7 +365,7 @@ replace_ucm_ee_14110_variables()
365365
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
366366
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_14110.yaml
367367
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
368-
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/inputs/mp_image_ee_byol.tfvars
368+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
369369
get_mp_values
370370
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
371371
}

‎solutions/jrf/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ terraform init
5252
Update the variable values in tfvars files under directories terraform/solutions/common and terraform/solutions/jrf according to the user specific values
5353
Invoke apply passing all *.tfvars files as input
5454
```bash
55-
terraform apply -var-file=../solutions/common/tenancy.tfvars -var-file=inputs/mp_image_ee_byol.tfvars -var-file=../solutions/jrf/jrf_instance.tfvars -var-file=../solutions/jrf/existing_lb.tfvars -var-file=../solutions/jrf/idcs.tfvars var-file=../solutions/jrf/oci_db.tfvars
55+
terraform apply -var-file=../solutions/common/tenancy.tfvars -var-file=images/mp_image_ee_byol.tfvars -var-file=../solutions/jrf/jrf_instance.tfvars -var-file=../solutions/jrf/existing_lb.tfvars -var-file=../solutions/jrf/idcs.tfvars var-file=../solutions/jrf/oci_db.tfvars
5656
```
5757

5858
To destroy the infrastructure
5959
```bash
60-
terraform destroy var-file=../solutions/common/tenancy.tfvars -var-file=inputs/mp_image_ee_byol.tfvars -var-file=../solutions/jrf/jrf_instance.tfvars -var-file=../solutions/jrf/existing_lb.tfvars -var-file=../solutions/jrf/idcs.tfvars var-file=../solutions/jrf/oci_db.tfvars
60+
terraform destroy var-file=../solutions/common/tenancy.tfvars -var-file=images/mp_image_ee_byol.tfvars -var-file=../solutions/jrf/jrf_instance.tfvars -var-file=../solutions/jrf/existing_lb.tfvars -var-file=../solutions/jrf/idcs.tfvars var-file=../solutions/jrf/oci_db.tfvars
6161
```
62-
**Important:** Refer to [documentation](https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/delete-domain.html) for steps to perform before running *terraform destroy*.
62+
**Important:** Refer to [documentation](https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/delete-domain.html) for steps to perform before running *terraform destroy*.

‎solutions/non_jrf/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ terraform init
5050
Update the variable values in tfvars files under directories terraform/solutions/common and terraform/solutions/non_jrf according to the user specific values
5151
Invoke apply passing all *.tfvars files as input
5252
```bash
53-
terraform apply -var-file=../solutions/common/tenancy.tfvars -var-file=inputs/mp_image_ee_byol.tfvars -var-file=../solutions/non_jrf/nonjrf_instance.tfvars -var-file=../solutions/non_jrf /lb.tfvars -var-file=../solutions/non_jrf/fss.tfvars
53+
terraform apply -var-file=../solutions/common/tenancy.tfvars -var-file=images/mp_image_ee_byol.tfvars -var-file=../solutions/non_jrf/nonjrf_instance.tfvars -var-file=../solutions/non_jrf /lb.tfvars -var-file=../solutions/non_jrf/fss.tfvars
5454
```
5555

5656
To destroy the infrastructure

‎terraform/inputs/mp_image_ee_byol.tfvars‎ renamed to ‎terraform/images/mp_image_ee_byol.tfvars‎

File renamed without changes.

‎terraform/inputs/mp_image_ee_ucm.tfvars‎ renamed to ‎terraform/images/mp_image_ee_ucm.tfvars‎

File renamed without changes.

‎terraform/inputs/mp_image_se_byol.tfvars‎ renamed to ‎terraform/images/mp_image_se_byol.tfvars‎

File renamed without changes.

‎terraform/inputs/mp_image_suite_byol.tfvars‎ renamed to ‎terraform/images/mp_image_suite_byol.tfvars‎

File renamed without changes.

‎terraform/inputs/mp_image_suite_ucm.tfvars‎ renamed to ‎terraform/images/mp_image_suite_ucm.tfvars‎

File renamed without changes.

0 commit comments

Comments
 (0)