Skip to content

Fix the mp script and uptake image values. #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 12, 2025
Merged

Fix the mp script and uptake image values. #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 154 additions & 8 deletions builds/build_mp_bundles.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ help()
{
echo "Build the Oracle Resource Manager (ORM) bundles to deploy in Marketplace"
echo
echo "Arguments: build_mp_bundles.sh -e|--edition <EE|SUITE|SE> -v|--version <12.2.1.4|14.1.1.0> -t|--type <UCM|BYOL> --all"
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"
echo "options:"
echo "-e, --edition WebLogic edition. Supported values are EE, SUITE, or SE. Optional when --all option is provided"
echo "-v, --version WebLogic version. Supported values are 12.2.1.4 or 14.1.1.0. Optional when --all option is provided"
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"
echo "-t, --type Type of bundle. Supported values are UCM or BYOL. Optional when --all option is provided"
echo "--all All bundles"
echo
Expand Down Expand Up @@ -78,7 +78,7 @@ validate()
echo "WebLogic version is not provided"
help
exit 1
elif [ "${WLS_VERSION}" != "12.2.1.4" ] && [ "${WLS_VERSION}" != "14.1.1.0" ]; then
elif [ "${WLS_VERSION}" != "12.2.1.4" ] && [ "${WLS_VERSION}" != "14.1.1.0" ] && [ "${WLS_VERSION}" != "14.1.2.0" ]; then
echo "Please provide valid WebLogic version"
help
exit 1
Expand Down Expand Up @@ -127,6 +127,13 @@ create_ucm_ee_14110()
replace_ucm_ee_14110_variables
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-ee-ucm-mp-14110.zip *; rm -Rf ${TMP_BUILD}/*)
}
create_ucm_ee_14120()
{
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema_14120.yaml ${TMP_BUILD}
cp -f ${SCRIPT_DIR}/../terraform/orm/orm_provider.tf ${TMP_BUILD}/provider.tf
replace_ucm_ee_14120_variables
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-ee-ucm-mp-14120.zip *; rm -Rf ${TMP_BUILD}/*)
}
create_ucm_suite_12214()
{
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema.yaml ${TMP_BUILD}
Expand All @@ -141,6 +148,13 @@ create_ucm_suite_14110()
replace_ucm_suite_14110_variables
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-suite-ucm-mp-14110.zip *; rm -Rf ${TMP_BUILD}/*)
}
create_ucm_suite_14120()
{
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema_14120.yaml ${TMP_BUILD}
cp -f ${SCRIPT_DIR}/../terraform/orm/orm_provider.tf ${TMP_BUILD}/provider.tf
replace_ucm_suite_14120_variables
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-suite-ucm-mp-14120.zip *; rm -Rf ${TMP_BUILD}/*)
}
create_byol_ee_12214()
{
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema.yaml ${TMP_BUILD}
Expand All @@ -155,6 +169,13 @@ create_byol_ee_14110()
replace_byol_ee_14110_variables
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-ee-byol-mp-14110.zip *; rm -Rf ${TMP_BUILD}/*)
}
create_byol_ee_14120()
{
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema_14120.yaml ${TMP_BUILD}
cp -f ${SCRIPT_DIR}/../terraform/orm/orm_provider.tf ${TMP_BUILD}/provider.tf
replace_byol_ee_14120_variables
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-ee-byol-mp-14120.zip *; rm -Rf ${TMP_BUILD}/*)
}
create_byol_suite_12214()
{
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema.yaml ${TMP_BUILD}
Expand All @@ -169,6 +190,13 @@ create_byol_suite_14110()
replace_byol_suite_14110_variables
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-suite-byol-mp-14110.zip *; rm -Rf ${TMP_BUILD}/*)
}
create_byol_suite_14120()
{
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema_14120.yaml ${TMP_BUILD}
cp -f ${SCRIPT_DIR}/../terraform/orm/orm_provider.tf ${TMP_BUILD}/provider.tf
replace_byol_suite_14120_variables
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-suite-byol-mp-14120.zip *; rm -Rf ${TMP_BUILD}/*)
}
create_byol_standard_12214()
{
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema.yaml ${TMP_BUILD}
Expand All @@ -183,6 +211,13 @@ create_byol_standard_14110()
replace_byol_se_14110_variables
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-se-byol-mp-14110.zip *; rm -Rf ${TMP_BUILD}/*)
}
create_byol_standard_14120()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we support standard edition with 14.1.2.0? I guess this is okay, but maybe we should check.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't see standard edition yet. We will keep it for now and unpublish or remove it if it's not needed for next release.

{
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema_14120.yaml ${TMP_BUILD}
cp -f ${SCRIPT_DIR}/../terraform/orm/orm_provider.tf ${TMP_BUILD}/provider.tf
replace_byol_se_14120_variables
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-se-byol-mp-14120.zip *; rm -Rf ${TMP_BUILD}/*)
}

replace_byol_ee_12214_variables()
{
Expand Down Expand Up @@ -225,6 +260,27 @@ replace_byol_ee_14110_variables()
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
}
replace_byol_ee_14120_variables()
{
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
get_mp_values
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = '"$tf_script_version"'' ${TMP_BUILD}/variables.tf
sed -i '/variable "wls_version" {/!b;n;n;n;cdefault = \"14.1.2.0\"' ${TMP_BUILD}/weblogic_variables.tf
sed -i '/variable "instance_image_id" {/!b;n;n;n;cdefault = '"$instance_image_id"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = '"true"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "listing_id" {/!b;n;n;n;cdefault = '"$listing_id"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "ucm_instance_image_id" {/!b;n;n;n;cdefault = '"${ucm_instance_image_id}"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "ucm_listing_id" {/!b;n;n;n;cdefault = '"$ucm_listing_id"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "ucm_listing_resource_version" {/!b;n;n;n;cdefault = '"$ucm_listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_14120.yaml
sed -i 's/#- ${image_mode}/- ${image_mode}/' ${TMP_BUILD}/schema_14120.yaml
sed -i 's/#- ${terms_and_conditions}/- ${terms_and_conditions}/' ${TMP_BUILD}/schema_14120.yaml
sed -i ':a;$!{N;ba};s/- ${image_mode}/#- ${image_mode}/2' ${TMP_BUILD}/schema_14120.yaml
sed -i ':a;$!{N;ba};s/- ${terms_and_conditions}/#- ${terms_and_conditions}/2' ${TMP_BUILD}/schema_14120.yaml
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
}
replace_byol_se_12214_variables()
{
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_se_byol.tfvars
Expand Down Expand Up @@ -262,6 +318,25 @@ replace_byol_se_14110_variables()
get_mp_values
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
}
replace_byol_se_14120_variables()
{
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_se_byol.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 = "SE"/' ${TMP_BUILD}/edition.tf
sed -i '/variable "wls_version" {/!b;n;n;n;cdefault = \"14.1.2.0\"' ${TMP_BUILD}/weblogic_variables.tf
sed -i '/variable "instance_image_id" {/!b;n;n;n;cdefault = '"$instance_image_id"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = '"true"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "listing_id" {/!b;n;n;n;cdefault = '"$listing_id"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_14120.yaml
sed -i 's/#- ${use_autoscaling}/- ${use_autoscaling}/' ${TMP_BUILD}/schema_14120.yaml
sed -i ':a;$!{N;ba};s/- ${use_autoscaling}/#- ${use_autoscaling}/1' ${TMP_BUILD}/schema_14120.yaml
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
get_mp_values
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
}
replace_byol_suite_12214_variables()
{
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_byol.tfvars
Expand Down Expand Up @@ -305,6 +380,28 @@ replace_byol_suite_14110_variables()
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
}
replace_byol_suite_14120_variables()
{
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_byol.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
sed -i '/variable "wls_version" {/!b;n;n;n;cdefault = \"14.1.2.0\"' ${TMP_BUILD}/weblogic_variables.tf
sed -i '/variable "instance_image_id" {/!b;n;n;n;cdefault = '"$instance_image_id"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = '"true"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "listing_id" {/!b;n;n;n;cdefault = '"$listing_id"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "ucm_instance_image_id" {/!b;n;n;n;cdefault = '"${ucm_instance_image_id}"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "ucm_listing_id" {/!b;n;n;n;cdefault = '"$ucm_listing_id"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "ucm_listing_resource_version" {/!b;n;n;n;cdefault = '"$ucm_listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_14120.yaml
sed -i 's/#- ${image_mode}/- ${image_mode}/' ${TMP_BUILD}/schema_14120.yaml
sed -i 's/#- ${terms_and_conditions}/- ${terms_and_conditions}/' ${TMP_BUILD}/schema_14120.yaml
sed -i ':a;$!{N;ba};s/- ${image_mode}/#- ${image_mode}/2' ${TMP_BUILD}/schema_14120.yaml
sed -i ':a;$!{N;ba};s/- ${terms_and_conditions}/#- ${terms_and_conditions}/2' ${TMP_BUILD}/schema_14120.yaml
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
}
replace_ucm_suite_12214_variables()
{
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_ucm.tfvars
Expand Down Expand Up @@ -338,6 +435,23 @@ replace_ucm_suite_14110_variables()
get_mp_values
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
}
replace_ucm_suite_14120_variables()
{
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/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
sed -i '/variable "wls_version" {/!b;n;n;n;cdefault = \"14.1.2.0\"' ${TMP_BUILD}/weblogic_variables.tf
sed -i '/variable "instance_image_id" {/!b;n;n;n;cdefault = '"$instance_image_id"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = '"true"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "listing_id" {/!b;n;n;n;cdefault = '"$listing_id"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_14120.yaml
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_suite_byol.tfvars
get_mp_values
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
}
replace_ucm_ee_12214_variables()
{
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_ucm.tfvars
Expand Down Expand Up @@ -369,6 +483,22 @@ replace_ucm_ee_14110_variables()
get_mp_values
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
}
replace_ucm_ee_14120_variables()
{
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_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 '/variable "wls_version" {/!b;n;n;n;cdefault = \"14.1.2.0\"' ${TMP_BUILD}/weblogic_variables.tf
sed -i '/variable "instance_image_id" {/!b;n;n;n;cdefault = '"$instance_image_id"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = '"true"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "listing_id" {/!b;n;n;n;cdefault = '"$listing_id"'' ${TMP_BUILD}/mp_variables.tf
sed -i '/variable "listing_resource_version" {/!b;n;n;n;cdefault = '"$listing_resource_version"'' ${TMP_BUILD}/mp_variables.tf
sed -i 's/#- ${instance_image_id}/- ${instance_image_id}/' ${TMP_BUILD}/schema_14120.yaml
sed -i '/main_mktpl_image/ { n; s/ocid = ""/ocid = '"${instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
export TF_VAR_FILE=${SCRIPT_DIR}/../terraform/images/mp_image_ee_byol.tfvars
get_mp_values
sed -i '/ucm_image/ { n; s/ocid = ""/ocid = '"${ucm_instance_image_id}"'/; }' ${TMP_BUILD}/oci_images.tf
}

get_mp_values()
{
Expand All @@ -384,47 +514,63 @@ get_mp_values()
if [ "${CREATE_ALL_BUNDLES}" == "true" ]; then
create_ucm_ee_12214
create_ucm_ee_14110
create_ucm_ee_14120
create_ucm_suite_12214
create_ucm_suite_14110
create_ucm_suite_14120
create_byol_ee_12214
create_byol_ee_14110
create_byol_ee_14120
create_byol_suite_12214
create_byol_suite_14110
create_byol_suite_14120
create_byol_standard_12214
create_byol_standard_14110
create_byol_standard_14120
else
if [ "${BUNDLE_TYPE}" == "UCM" ]; then
if [ "${WLS_EDITION}" == "EE" ]; then
if [ "${WLS_VERSION}" == "12.2.1.4" ]; then
create_ucm_ee_12214
else
elif [ "${WLS_VERSION}" == "14.1.1.0" ]; then
create_ucm_ee_14110
else
create_ucm_ee_14120
fi

elif [ "${WLS_EDITION}" == "SUITE" ]; then
if [ "${WLS_VERSION}" == "12.2.1.4" ]; then
create_ucm_suite_12214
else
elif [ "${WLS_VERSION}" == "14.1.1.0" ]; then
create_ucm_suite_14110
else
create_ucm_suite_14120
fi
fi
else
if [ "${WLS_EDITION}" == "EE" ]; then
if [ "${WLS_VERSION}" == "12.2.1.4" ]; then
create_byol_ee_12214
else
elif [ "${WLS_VERSION}" == "14.1.1.0" ]; then
create_byol_ee_14110
else
create_byol_ee_14120
fi
elif [ "${WLS_EDITION}" == "SUITE" ]; then
if [ "${WLS_VERSION}" == "12.2.1.4" ]; then
create_byol_suite_12214
else
elif [ "${WLS_VERSION}" == "14.1.1.0" ]; then
create_byol_suite_14110
else
create_byol_suite_14120
fi
else
if [ "${WLS_VERSION}" == "12.2.1.4" ]; then
create_byol_se_12214
else
elif [ "${WLS_VERSION}" == "14.1.1.0" ]; then
create_byol_se_14110
else
create_byol_se_14120
fi
fi
fi
Expand Down
10 changes: 5 additions & 5 deletions terraform/images/mp_image_ee_byol.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Copyright (c) 2023,2024, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.

tf_script_version = "25.1.1-250122225215"
tf_script_version = "25.1.3-250310205030"
use_marketplace_image = true
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
listing_resource_version = "25.1.1-ol8.8-23.12.13-250122-1"
instance_image_id = "ocid1.image.oc1..aaaaaaaaxmzmckfq6qajxkplzdt2ucjac5h2qrjsh6vflrgjdxb5nzilxzua"
listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Latest platform image is 8.10. I'm fine with sticking with 8.8 for now, especially since this is what we tested with, but we should consider upping the minor version in April releases.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. I will fix it.

instance_image_id = "ocid1.image.oc1..aaaaaaaa2vaqsz6evogb5jr2dhpdlbyqcnyydpcdljpi5plemo2roru6ld3a"

ucm_listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
ucm_listing_resource_version = "25.1.1-ol8.8-23.12.13-250122-1"
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaagg6ppgbdff6xxzxyv6mxar4aejbhdxxxzl7i3y6eq665mktdvx7q"
ucm_listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaat4dyc73wuxeccdsegmjgdbt7v3xxtdcwo6hgbvdep5xe2mybvmva"
7 changes: 3 additions & 4 deletions terraform/images/mp_image_ee_ucm.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# Copyright (c) 2023,2024, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.

tf_script_version = "25.1.1-250122225215"
tf_script_version = "25.1.3-250310205030"
use_marketplace_image = true
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
listing_resource_version = "25.1.1-ol8.8-23.12.13-250122-1"
instance_image_id = "ocid1.image.oc1..aaaaaaaagg6ppgbdff6xxzxyv6mxar4aejbhdxxxzl7i3y6eq665mktdvx7q"

listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
instance_image_id = "ocid1.image.oc1..aaaaaaaat4dyc73wuxeccdsegmjgdbt7v3xxtdcwo6hgbvdep5xe2mybvmva"
6 changes: 3 additions & 3 deletions terraform/images/mp_image_se_byol.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Copyright (c) 2023,2024, Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.

tf_script_version = "25.1.1-250122225215"
tf_script_version = "25.1.3-250310205030"
use_marketplace_image = true
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
listing_resource_version = "25.1.1-ol8.8-23.12.13-250122-1"
instance_image_id = "ocid1.image.oc1..aaaaaaaawiuf52uii3weey6tikixfemyu5msovhb63x44tw4qajcdxjve5tq"
listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
instance_image_id = "ocid1.image.oc1..aaaaaaaa3qzkazz7it2emgju5btaccnkro6wbz6mmbw7np3im6nky7srqsva"
Loading