Skip to content

Commit 6bdb0e3

Browse files
rachavanRajesh Chavan
rachavan
and
Rajesh Chavan
authored
Uptake 25.4.1 MP Image Ocids and Update mp build scripts to create 15110 mp bundle (#340)
Uptake 25.4.1 MP Image Ocids and Update mp build scripts to create 15110 mp bundle --------- Co-authored-by: Rajesh Chavan <[email protected]>
1 parent 89a206c commit 6bdb0e3

File tree

6 files changed

+178
-33
lines changed

6 files changed

+178
-33
lines changed

‎builds/build_mp_bundles.sh‎

Lines changed: 154 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Copyright (c) 2023, Oracle and/or its affiliates.
3+
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
44
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
55

66
############################################################
@@ -10,10 +10,10 @@ help()
1010
{
1111
echo "Build the Oracle Resource Manager (ORM) bundles to deploy in Marketplace"
1212
echo
13-
echo "Arguments: build_mp_bundles.sh -e|--edition <EE|SUITE|SE> -v|--version <12.2.1.4|14.1.1.0|14.1.2.0> -t|--type <UCM|BYOL> --all"
13+
echo "Arguments: build_mp_bundles.sh -e|--edition <EE|SUITE|SE> -v|--version <12.2.1.4|14.1.1.0|14.1.2.0|15.1.1.0> -t|--type <UCM|BYOL> --all"
1414
echo "options:"
1515
echo "-e, --edition WebLogic edition. Supported values are EE, SUITE, or SE. Optional when --all option is provided"
16-
echo "-v, --version WebLogic version. Supported values are 12.2.1.4 or 14.1.1.0 or 14.1.2.0. Optional when --all option is provided"
16+
echo "-v, --version WebLogic version. Supported values are 12.2.1.4 or 14.1.1.0 or 14.1.2.0 or 15.1.1.0. Optional when --all option is provided"
1717
echo "-t, --type Type of bundle. Supported values are UCM or BYOL. Optional when --all option is provided"
1818
echo "--all All bundles"
1919
echo
@@ -78,7 +78,7 @@ validate()
7878
echo "WebLogic version is not provided"
7979
help
8080
exit 1
81-
elif [ "${WLS_VERSION}" != "12.2.1.4" ] && [ "${WLS_VERSION}" != "14.1.1.0" ] && [ "${WLS_VERSION}" != "14.1.2.0" ]; then
81+
elif [ "${WLS_VERSION}" != "12.2.1.4" ] && [ "${WLS_VERSION}" != "14.1.1.0" ] && [ "${WLS_VERSION}" != "14.1.2.0" ] && [ "${WLS_VERSION}" != "15.1.1.0" ]; then
8282
echo "Please provide valid WebLogic version"
8383
help
8484
exit 1
@@ -134,6 +134,13 @@ create_ucm_ee_14120()
134134
replace_ucm_ee_14120_variables
135135
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-ee-ucm-mp-14120.zip *; rm -Rf ${TMP_BUILD}/*)
136136
}
137+
create_ucm_ee_15110()
138+
{
139+
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema_15110.yaml ${TMP_BUILD}
140+
cp -f ${SCRIPT_DIR}/../terraform/orm/orm_provider.tf ${TMP_BUILD}/provider.tf
141+
replace_ucm_ee_15110_variables
142+
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-ee-ucm-mp-15110.zip *; rm -Rf ${TMP_BUILD}/*)
143+
}
137144
create_ucm_suite_12214()
138145
{
139146
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema.yaml ${TMP_BUILD}
@@ -155,6 +162,13 @@ create_ucm_suite_14120()
155162
replace_ucm_suite_14120_variables
156163
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-suite-ucm-mp-14120.zip *; rm -Rf ${TMP_BUILD}/*)
157164
}
165+
create_ucm_suite_15110()
166+
{
167+
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema_15110.yaml ${TMP_BUILD}
168+
cp -f ${SCRIPT_DIR}/../terraform/orm/orm_provider.tf ${TMP_BUILD}/provider.tf
169+
replace_ucm_suite_15110_variables
170+
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-suite-ucm-mp-15110.zip *; rm -Rf ${TMP_BUILD}/*)
171+
}
158172
create_byol_ee_12214()
159173
{
160174
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema.yaml ${TMP_BUILD}
@@ -176,6 +190,13 @@ create_byol_ee_14120()
176190
replace_byol_ee_14120_variables
177191
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-ee-byol-mp-14120.zip *; rm -Rf ${TMP_BUILD}/*)
178192
}
193+
create_byol_ee_15110()
194+
{
195+
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema_15110.yaml ${TMP_BUILD}
196+
cp -f ${SCRIPT_DIR}/../terraform/orm/orm_provider.tf ${TMP_BUILD}/provider.tf
197+
replace_byol_ee_15110_variables
198+
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-ee-byol-mp-15110.zip *; rm -Rf ${TMP_BUILD}/*)
199+
}
179200
create_byol_suite_12214()
180201
{
181202
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema.yaml ${TMP_BUILD}
@@ -197,6 +218,13 @@ create_byol_suite_14120()
197218
replace_byol_suite_14120_variables
198219
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-suite-byol-mp-14120.zip *; rm -Rf ${TMP_BUILD}/*)
199220
}
221+
create_byol_suite_15110()
222+
{
223+
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema_15110.yaml ${TMP_BUILD}
224+
cp -f ${SCRIPT_DIR}/../terraform/orm/orm_provider.tf ${TMP_BUILD}/provider.tf
225+
replace_byol_suite_15110_variables
226+
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-suite-byol-mp-15110.zip *; rm -Rf ${TMP_BUILD}/*)
227+
}
200228
create_byol_standard_12214()
201229
{
202230
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema.yaml ${TMP_BUILD}
@@ -218,6 +246,13 @@ create_byol_standard_14120()
218246
replace_byol_se_14120_variables
219247
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-se-byol-mp-14120.zip *; rm -Rf ${TMP_BUILD}/*)
220248
}
249+
create_byol_standard_15110()
250+
{
251+
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema_15110.yaml ${TMP_BUILD}
252+
cp -f ${SCRIPT_DIR}/../terraform/orm/orm_provider.tf ${TMP_BUILD}/provider.tf
253+
replace_byol_se_15110_variables
254+
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-se-byol-mp-15110.zip *; rm -Rf ${TMP_BUILD}/*)
255+
}
221256

222257
replace_byol_ee_12214_variables()
223258
{
@@ -281,6 +316,27 @@ replace_byol_ee_14120_variables()
281316
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
282317
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
283318
}
319+
replace_byol_ee_15110_variables()
320+
{
321+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
322+
get_mp_values
323+
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
324+
sed -i '/variable "wls_version" {/!b;n;n;n;cdefault = \"15.1.1.0\"' ${TMP_BUILD}/weblogic_variables.tf
325+
sed -i '/variable "instance_image_id" {/!b;n;n;n;cdefault = '"$instance_image_id"'' ${TMP_BUILD}/mp_variables.tf
326+
sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = '"true"'' ${TMP_BUILD}/mp_variables.tf
327+
sed -i '/variable "listing_id" {/!b;n;n;n;cdefault = '"$listing_id"'' ${TMP_BUILD}/mp_variables.tf
328+
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
329+
sed -i '/variable "ucm_instance_image_id" {/!b;n;n;n;cdefault = '"${ucm_instance_image_id}"'' ${TMP_BUILD}/mp_variables.tf
330+
sed -i '/variable "ucm_listing_id" {/!b;n;n;n;cdefault = '"$ucm_listing_id"'' ${TMP_BUILD}/mp_variables.tf
331+
sed -i '/variable "ucm_listing_resource_version" {/!b;n;n;n;cdefault = '"$ucm_listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
332+
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_15110.yaml
333+
sed -i 's/#- ${image_mode}/- ${image_mode}/' ${TMP_BUILD}/schema_15110.yaml
334+
sed -i 's/#- ${terms_and_conditions}/- ${terms_and_conditions}/' ${TMP_BUILD}/schema_15110.yaml
335+
sed -i ':a;$!{N;ba};s/- ${image_mode}/#- ${image_mode}/2' ${TMP_BUILD}/schema_15110.yaml
336+
sed -i ':a;$!{N;ba};s/- ${terms_and_conditions}/#- ${terms_and_conditions}/2' ${TMP_BUILD}/schema_15110.yaml
337+
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
338+
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
339+
}
284340
replace_byol_se_12214_variables()
285341
{
286342
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_se_byol.tfvars
@@ -337,6 +393,25 @@ replace_byol_se_14120_variables()
337393
get_mp_values
338394
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
339395
}
396+
replace_byol_se_15110_variables()
397+
{
398+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_se_byol.tfvars
399+
get_mp_values
400+
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
401+
sed -i 's/default = "EE"/default = "SE"/' ${TMP_BUILD}/edition.tf
402+
sed -i '/variable "wls_version" {/!b;n;n;n;cdefault = \"15.1.1.0\"' ${TMP_BUILD}/weblogic_variables.tf
403+
sed -i '/variable "instance_image_id" {/!b;n;n;n;cdefault = '"$instance_image_id"'' ${TMP_BUILD}/mp_variables.tf
404+
sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = '"true"'' ${TMP_BUILD}/mp_variables.tf
405+
sed -i '/variable "listing_id" {/!b;n;n;n;cdefault = '"$listing_id"'' ${TMP_BUILD}/mp_variables.tf
406+
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
407+
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_15110.yaml
408+
sed -i 's/#- ${use_autoscaling}/- ${use_autoscaling}/' ${TMP_BUILD}/schema_15110.yaml
409+
sed -i ':a;$!{N;ba};s/- ${use_autoscaling}/#- ${use_autoscaling}/1' ${TMP_BUILD}/schema_15110.yaml
410+
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
411+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
412+
get_mp_values
413+
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
414+
}
340415
replace_byol_suite_12214_variables()
341416
{
342417
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_byol.tfvars
@@ -402,6 +477,28 @@ replace_byol_suite_14120_variables()
402477
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
403478
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
404479
}
480+
replace_byol_suite_15110_variables()
481+
{
482+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_byol.tfvars
483+
get_mp_values
484+
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
485+
sed -i 's/default = "EE"/default = "SUITE"/' ${TMP_BUILD}/edition.tf
486+
sed -i '/variable "wls_version" {/!b;n;n;n;cdefault = \"15.1.1.0\"' ${TMP_BUILD}/weblogic_variables.tf
487+
sed -i '/variable "instance_image_id" {/!b;n;n;n;cdefault = '"$instance_image_id"'' ${TMP_BUILD}/mp_variables.tf
488+
sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = '"true"'' ${TMP_BUILD}/mp_variables.tf
489+
sed -i '/variable "listing_id" {/!b;n;n;n;cdefault = '"$listing_id"'' ${TMP_BUILD}/mp_variables.tf
490+
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
491+
sed -i '/variable "ucm_instance_image_id" {/!b;n;n;n;cdefault = '"${ucm_instance_image_id}"'' ${TMP_BUILD}/mp_variables.tf
492+
sed -i '/variable "ucm_listing_id" {/!b;n;n;n;cdefault = '"$ucm_listing_id"'' ${TMP_BUILD}/mp_variables.tf
493+
sed -i '/variable "ucm_listing_resource_version" {/!b;n;n;n;cdefault = '"$ucm_listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
494+
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_15110.yaml
495+
sed -i 's/#- ${image_mode}/- ${image_mode}/' ${TMP_BUILD}/schema_15110.yaml
496+
sed -i 's/#- ${terms_and_conditions}/- ${terms_and_conditions}/' ${TMP_BUILD}/schema_15110.yaml
497+
sed -i ':a;$!{N;ba};s/- ${image_mode}/#- ${image_mode}/2' ${TMP_BUILD}/schema_15110.yaml
498+
sed -i ':a;$!{N;ba};s/- ${terms_and_conditions}/#- ${terms_and_conditions}/2' ${TMP_BUILD}/schema_15110.yaml
499+
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
500+
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
501+
}
405502
replace_ucm_suite_12214_variables()
406503
{
407504
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_ucm.tfvars
@@ -452,6 +549,23 @@ replace_ucm_suite_14120_variables()
452549
get_mp_values
453550
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
454551
}
552+
replace_ucm_suite_15110_variables()
553+
{
554+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_ucm.tfvars
555+
get_mp_values
556+
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
557+
sed -i 's/default = "EE"/default = "SUITE"/' ${TMP_BUILD}/edition.tf
558+
sed -i '/variable "wls_version" {/!b;n;n;n;cdefault = \"15.1.1.0\"' ${TMP_BUILD}/weblogic_variables.tf
559+
sed -i '/variable "instance_image_id" {/!b;n;n;n;cdefault = '"$instance_image_id"'' ${TMP_BUILD}/mp_variables.tf
560+
sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = '"true"'' ${TMP_BUILD}/mp_variables.tf
561+
sed -i '/variable "listing_id" {/!b;n;n;n;cdefault = '"$listing_id"'' ${TMP_BUILD}/mp_variables.tf
562+
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
563+
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_15110.yaml
564+
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
565+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_byol.tfvars
566+
get_mp_values
567+
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
568+
}
455569
replace_ucm_ee_12214_variables()
456570
{
457571
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_ucm.tfvars
@@ -499,6 +613,22 @@ replace_ucm_ee_14120_variables()
499613
get_mp_values
500614
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
501615
}
616+
replace_ucm_ee_15110_variables()
617+
{
618+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_ucm.tfvars
619+
get_mp_values
620+
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
621+
sed -i '/variable "wls_version" {/!b;n;n;n;cdefault = \"15.1.1.0\"' ${TMP_BUILD}/weblogic_variables.tf
622+
sed -i '/variable "instance_image_id" {/!b;n;n;n;cdefault = '"$instance_image_id"'' ${TMP_BUILD}/mp_variables.tf
623+
sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = '"true"'' ${TMP_BUILD}/mp_variables.tf
624+
sed -i '/variable "listing_id" {/!b;n;n;n;cdefault = '"$listing_id"'' ${TMP_BUILD}/mp_variables.tf
625+
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
626+
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_15110.yaml
627+
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
628+
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
629+
get_mp_values
630+
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
631+
}
502632

503633
get_mp_values()
504634
{
@@ -515,36 +645,45 @@ if [ "${CREATE_ALL_BUNDLES}" == "true" ]; then
515645
create_ucm_ee_12214
516646
create_ucm_ee_14110
517647
create_ucm_ee_14120
648+
create_ucm_ee_15110
518649
create_ucm_suite_12214
519650
create_ucm_suite_14110
520651
create_ucm_suite_14120
652+
create_ucm_suite_15110
521653
create_byol_ee_12214
522654
create_byol_ee_14110
523655
create_byol_ee_14120
656+
create_byol_ee_15110
524657
create_byol_suite_12214
525658
create_byol_suite_14110
526659
create_byol_suite_14120
660+
create_byol_suite_15110
527661
create_byol_standard_12214
528662
create_byol_standard_14110
529663
create_byol_standard_14120
664+
create_byol_standard_15110
530665
else
531666
if [ "${BUNDLE_TYPE}" == "UCM" ]; then
532667
if [ "${WLS_EDITION}" == "EE" ]; then
533668
if [ "${WLS_VERSION}" == "12.2.1.4" ]; then
534669
create_ucm_ee_12214
535670
elif [ "${WLS_VERSION}" == "14.1.1.0" ]; then
536671
create_ucm_ee_14110
672+
elif [ "${WLS_VERSION}" == "14.1.2.0" ]; then
673+
create_ucm_ee_14120
537674
else
538-
create_ucm_ee_14120
675+
create_ucm_ee_15110
539676
fi
540677

541678
elif [ "${WLS_EDITION}" == "SUITE" ]; then
542679
if [ "${WLS_VERSION}" == "12.2.1.4" ]; then
543680
create_ucm_suite_12214
544681
elif [ "${WLS_VERSION}" == "14.1.1.0" ]; then
545682
create_ucm_suite_14110
683+
elif [ "${WLS_VERSION}" == "14.1.2.0" ]; then
684+
create_ucm_suite_14120
546685
else
547-
create_ucm_suite_14120
686+
create_ucm_suite_15110
548687
fi
549688
fi
550689
else
@@ -553,24 +692,30 @@ else
553692
create_byol_ee_12214
554693
elif [ "${WLS_VERSION}" == "14.1.1.0" ]; then
555694
create_byol_ee_14110
695+
elif [ "${WLS_VERSION}" == "14.1.2.0" ]; then
696+
create_byol_ee_14120
556697
else
557-
create_byol_ee_14120
698+
create_byol_ee_15110
558699
fi
559700
elif [ "${WLS_EDITION}" == "SUITE" ]; then
560701
if [ "${WLS_VERSION}" == "12.2.1.4" ]; then
561702
create_byol_suite_12214
562703
elif [ "${WLS_VERSION}" == "14.1.1.0" ]; then
563704
create_byol_suite_14110
705+
elif [ "${WLS_VERSION}" == "14.1.2.0" ]; then
706+
create_byol_suite_14120
564707
else
565-
create_byol_suite_14120
708+
create_byol_suite_15110
566709
fi
567710
else
568711
if [ "${WLS_VERSION}" == "12.2.1.4" ]; then
569712
create_byol_se_12214
570713
elif [ "${WLS_VERSION}" == "14.1.1.0" ]; then
571714
create_byol_se_14110
715+
elif [ "${WLS_VERSION}" == "14.1.2.0" ]; then
716+
create_byol_se_14120
572717
else
573-
create_byol_se_14120
718+
create_byol_se_15110
574719
fi
575720
fi
576721
fi

‎terraform/images/mp_image_ee_byol.tfvars‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# Copyright (c) 2023,2024, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

4-
tf_script_version = "25.3.1-250719002626"
4+
tf_script_version = "25.4.1-251024040114"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
7-
listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaau76znd35hrciub7wfojcgfq435bqpehv4ry4fcmom74b7l7zw4ta"
7+
listing_resource_version = "25.4.1-ol8.8-23.12.13-251024-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaajtldbwdlrovciafil4vjkcfkp26qpnpuajyyiphnmitfuo2ix6la"
99

1010
ucm_listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
11-
ucm_listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
12-
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaajf5gc2zhxbzbfhvnujt6k2do3rd4wfjqspuq6gmtm2qhhberjttq"
11+
ucm_listing_resource_version = "25.4.1-ol8.8-23.12.13-251024-1"
12+
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaanptrtarff3qsf46hhy37j66jl7mps227t65ur2vu2msjbxoye2ba"
1313

‎terraform/images/mp_image_ee_ucm.tfvars‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# Copyright (c) 2023,2024, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2025, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

4-
tf_script_version = "25.3.1-250719002626"
4+
tf_script_version = "25.4.1-251024040114"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
7-
listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaajf5gc2zhxbzbfhvnujt6k2do3rd4wfjqspuq6gmtm2qhhberjttq"
7+
listing_resource_version = "25.4.1-ol8.8-23.12.13-251024-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaanptrtarff3qsf46hhy37j66jl7mps227t65ur2vu2msjbxoye2ba"
99

0 commit comments

Comments
 (0)