Skip to content

Commit 67cb3b7

Browse files
skommalaabhijit-paranjpetelakeroberto-sanchez-herreraPM-Darshan
authored
Development (#309)
Merge from development to main --------- Co-authored-by: Abhijit Paranjpe <[email protected]> Co-authored-by: telake <[email protected]> Co-authored-by: Roberto Sanchez Herrera <[email protected]> Co-authored-by: P M Darshan <[email protected]> Co-authored-by: C R Aniruddh Srivatsa <[email protected]> Co-authored-by: Mahuwa Barman <[email protected]> Co-authored-by: Chintamani Bhat <[email protected]> Co-authored-by: Sarada Kommalapati <[email protected]> Co-authored-by: Adrian Padilla Duarte <[email protected]> Co-authored-by: Mahuwa-Barman <[email protected]> Co-authored-by: srjanaki <[email protected]> Co-authored-by: ManviGupta-prog <[email protected]>
1 parent f8ef6b0 commit 67cb3b7

22 files changed

+3105
-84
lines changed

‎builds/build_mp_bundles.sh‎

Lines changed: 154 additions & 8 deletions
Large diffs are not rendered by default.

‎builds/build_orm_dev.sh‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ help()
1414
{
1515
echo "Build the Oracle Resource Manager (ORM) bundles for developers to deploy in Marketplace"
1616
echo
17-
echo "Arguments: build_orm_dev.sh -v|--version <12.2.1.4|14.1.1.0> -t|--scripts_version --all"
17+
echo "Arguments: build_orm_dev.sh -v|--version <12.2.1.4|14.1.1.0|14.1.2.0> -t|--scripts_version --all"
1818
echo "options:"
19-
echo "-v, --version WebLogic version. Supported values are 12.2.1.4 or 14.1.1.0. Optional when --all option is provided"
19+
echo "-v, --version WebLogic version. Supported values are 12.2.1.4,14.1.2.0 or 14.1.1.0 Optional when --all option is provided"
2020
echo "-t, --scripts_version VM scripts version"
2121
echo "--all All bundles"
2222
echo
@@ -73,7 +73,7 @@ validate()
7373
echo "WebLogic version is not provided"
7474
help
7575
exit 1
76-
elif [ "${WLS_VERSION}" != "12.2.1.4" ] && [ "${WLS_VERSION}" != "14.1.1.0" ]; then
76+
elif [ "${WLS_VERSION}" != "12.2.1.4" ] && [ "${WLS_VERSION}" != "14.1.2.0" ] && [ "${WLS_VERSION}" != "14.1.1.0" ]; then
7777
echo "Please provide valid WebLogic version"
7878
help
7979
exit 1
@@ -105,7 +105,14 @@ create_14110_bundle()
105105
cp -f ${SCRIPT_DIR}/../terraform/orm/orm_provider.tf ${TMP_BUILD}/provider.tf
106106
replace_14110_variables
107107
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-ee-14110.zip *; rm -Rf ${TMP_BUILD}/*)
108-
}
108+
}
109+
create_14120_bundle()
110+
{
111+
cp -Rf ${SCRIPT_DIR}/../terraform/modules ${SCRIPT_DIR}/../terraform/*.tf ${SCRIPT_DIR}/../terraform/schema_14120.yaml ${TMP_BUILD}
112+
cp -f ${SCRIPT_DIR}/../terraform/orm/orm_provider.tf ${TMP_BUILD}/provider.tf
113+
replace_14120_variables
114+
(cd ${TMP_BUILD}; zip -r ${SCRIPT_DIR}/binaries/wlsoci-resource-manager-ee-14120.zip *; rm -Rf ${TMP_BUILD}/*)
115+
}
109116

110117
#need to change it to false after RM UI fix
111118
replace_12214_variables()
@@ -123,15 +130,25 @@ replace_14110_variables()
123130
sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = false' ${TMP_BUILD}/mp_variables.tf
124131
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = \"'"$SCRIPTS_VERSION"'\"' ${TMP_BUILD}/variables.tf
125132
}
133+
replace_14120_variables()
134+
{
135+
sed -i '/variable "generate_dg_tag" {/!b;n;n;n;cdefault = false' ${TMP_BUILD}/variables.tf
136+
sed -i '/variable "wls_version" {/!b;n;n;n;cdefault = \"14.1.2.0\"' ${TMP_BUILD}/weblogic_variables.tf
137+
sed -i '/variable "use_marketplace_image" {/!b;n;n;n;cdefault = false' ${TMP_BUILD}/mp_variables.tf
138+
sed -i '/variable "tf_script_version" {/!b;n;n;n;cdefault = \"'"$SCRIPTS_VERSION"'\"' ${TMP_BUILD}/variables.tf
139+
}
126140

127141
if [ "${CREATE_ALL_BUNDLES}" == "true" ]; then
128142
create_12214_bundle
129143
create_14110_bundle
144+
create_14120_bundle
130145
else
131146
if [ "${WLS_VERSION}" == "12.2.1.4" ]; then
132-
create_12214_bundle
147+
create_12214_bundle
148+
elif [ "${WLS_VERSION}" == "14.1.2.0" ]; then
149+
create_14120_bundle
133150
else
134-
create_14110_bundle
151+
create_14110_bundle
135152
fi
136153
fi
137154

‎terraform/images/mp_image_ee_byol.tfvars‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Copyright (c) 2023,2024, 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.1.1-250122225215"
4+
tf_script_version = "25.1.3-250310205030"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
7-
listing_resource_version = "25.1.1-ol8.8-23.12.13-250122-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaaxmzmckfq6qajxkplzdt2ucjac5h2qrjsh6vflrgjdxb5nzilxzua"
7+
listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaa2vaqsz6evogb5jr2dhpdlbyqcnyydpcdljpi5plemo2roru6ld3a"
99

1010
ucm_listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
11-
ucm_listing_resource_version = "25.1.1-ol8.8-23.12.13-250122-1"
12-
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaagg6ppgbdff6xxzxyv6mxar4aejbhdxxxzl7i3y6eq665mktdvx7q"
11+
ucm_listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
12+
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaat4dyc73wuxeccdsegmjgdbt7v3xxtdcwo6hgbvdep5xe2mybvmva"

‎terraform/images/mp_image_ee_ucm.tfvars‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# Copyright (c) 2023,2024, 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.1.1-250122225215"
4+
tf_script_version = "25.1.3-250310205030"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
7-
listing_resource_version = "25.1.1-ol8.8-23.12.13-250122-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaagg6ppgbdff6xxzxyv6mxar4aejbhdxxxzl7i3y6eq665mktdvx7q"
9-
7+
listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaat4dyc73wuxeccdsegmjgdbt7v3xxtdcwo6hgbvdep5xe2mybvmva"

‎terraform/images/mp_image_se_byol.tfvars‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Copyright (c) 2023,2024, 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.1.1-250122225215"
4+
tf_script_version = "25.1.3-250310205030"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
7-
listing_resource_version = "25.1.1-ol8.8-23.12.13-250122-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaawiuf52uii3weey6tikixfemyu5msovhb63x44tw4qajcdxjve5tq"
7+
listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaa3qzkazz7it2emgju5btaccnkro6wbz6mmbw7np3im6nky7srqsva"

‎terraform/images/mp_image_suite_byol.tfvars‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Copyright (c) 2023,2024, 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.1.1-250122225215"
4+
tf_script_version = "25.1.3-250310205030"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
7-
listing_resource_version = "25.1.1-ol8.8-23.12.13-250122-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaa6ktrzaebul6d3qdr5zi6twm5gkdr6wlzcx4ilvlkwkbw7bgemwla"
7+
listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaa3qzkazz7it2emgju5btaccnkro6wbz6mmbw7np3im6nky7srqsva"
99

1010
ucm_listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
11-
ucm_listing_resource_version = "25.1.1-ol8.8-23.12.13-250122-1"
12-
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaak3naanidaq44wv3m5bziv6fccmmem6lkyqpi4mmdsdfrzs53utwq"
11+
ucm_listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
12+
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaab346dek7j74rmxvm2hx2cquyncuvrxzwxyyswiqek4mwg52o4iia"

‎terraform/images/mp_image_suite_ucm.tfvars‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Copyright (c) 2023,2024, 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.1.1-250122225215"
4+
tf_script_version = "25.1.3-250310205030"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
7-
listing_resource_version = "25.1.1-ol8.8-23.12.13-250122-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaak3naanidaq44wv3m5bziv6fccmmem6lkyqpi4mmdsdfrzs53utwq"
7+
listing_resource_version = "25.1.3-ol8.8-23.12.13-250310-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaab346dek7j74rmxvm2hx2cquyncuvrxzwxyyswiqek4mwg52o4iia"
99

‎terraform/locals.tf‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,14 @@ locals {
106106

107107
async_prov_mode = !local.assign_weblogic_public_ip && !var.is_rms_private_endpoint_required && !var.is_bastion_instance_required ? "Asynchronous provisioning is enabled. Connect to each compute instance and confirm that the file /u01/data/domains/${format("%s_domain", local.service_name_prefix)}/provCompletedMarker exists. Details are found in the file /u01/logs/provisioning.log." : ""
108108

109-
jdk_labels = { jdk7 = "JDK 7", jdk8 = "JDK 8", jdk11 = "JDK 11" }
110-
jdk_version = var.wls_version == "14.1.1.0" ? local.jdk_labels[var.wls_14c_jdk_version] : (var.wls_version == "11.1.1.7" ? local.jdk_labels["jdk7"] : local.jdk_labels["jdk8"])
109+
jdk_labels = { jdk7 = "JDK 7", jdk8 = "JDK 8", jdk11 = "JDK 11", jdk17 = "JDK 17", jdk21 = "JDK 21" }
110+
jdk_version = lookup(
111+
local.jdk_labels,
112+
var.wls_version == "14.1.1.0" ? var.wls_14c_jdk_version :
113+
var.wls_version == "14.1.2.0" ? var.wls_14120_jdk_version :
114+
var.wls_version == "11.1.1.7" ? "jdk7" : "jdk8"
115+
)
116+
111117

112118
user_defined_tag_values = values(var.service_tags.definedTags)
113119

@@ -144,7 +150,7 @@ locals {
144150
fmw_console_app_url = local.requires_JRF ? format(
145151
"https://%s:%s/em",
146152
local.admin_ip_address,
147-
var.wls_extern_ssl_admin_port,
153+
local.wls_extern_ssl_admin_port,
148154
) : ""
149155

150156
use_apm_service = (var.use_apm_service || var.use_autoscaling)

‎terraform/main.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,7 @@ module "compute" {
612612
tf_script_version = var.tf_script_version
613613
use_regional_subnet = local.use_regional_subnet
614614
wls_14c_jdk_version = var.wls_14c_jdk_version
615+
wls_14120_jdk_version = var.wls_14120_jdk_version
615616
wls_admin_user = local.wls_admin_user
616617
wls_admin_password_id = var.wls_admin_password_id
617618
wls_admin_server_name = format("%s_adminserver", local.service_name_prefix)

‎terraform/modules/compute/wls_compute/wls_compute.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ module "wls-instances" {
6767
wls_edition = var.wls_edition
6868
is_bastion_instance_required = var.is_bastion_instance_required
6969
create_policies = var.create_policies
70-
70+
enable_restful_management_services = var.wls_version == "14.1.2.0" ? true : false
7171
# Secured Production Mode
7272
configure_secure_mode = var.configure_secure_mode
7373
preserve_boot_properties = var.preserve_boot_properties
@@ -87,7 +87,7 @@ module "wls-instances" {
8787
wls_version = var.wls_version
8888
wls_14c_jdk_version = var.wls_14c_jdk_version
8989
fmiddleware_zip = var.wls_version_to_fmw_map[var.wls_version]
90-
jdk_zip = var.wls_version == "14.1.1.0" ? var.wls_14c_to_jdk_map[var.wls_14c_jdk_version] : var.wls_version_to_jdk_map[var.wls_version]
90+
jdk_zip = var.wls_version == "14.1.1.0" ? var.wls_14c_to_jdk_map[var.wls_14c_jdk_version] :var.wls_version == "14.1.2.0" ? var.wls_14120_to_jdk_map[var.wls_14120_jdk_version] :var.wls_version_to_jdk_map[var.wls_version]
9191
vmscripts_path = var.vmscripts_path
9292
log_level = var.log_level
9393
mw_vol_mount_point = lookup(var.volume_map[0], "volume_mount_point")

0 commit comments

Comments
 (0)