Skip to content

Commit 556ebc6

Browse files
sanjaymantoorsanjaymantoor
authored
Added 14.1.2.0.0 images and removed linux 7.6 references for SingleNode and Admin offer (#353)
* Added pids for 14.1.2.0.0 base vm images * Added 14.1.2.0.0 images list and removed linux 7.6 references * Added 14.1.2.0.0 images and removed linux 7.6 references for admin offer * Updated JSON format for admin offer UiDefinition * Updating virtualNetworkResourceGroupName based on virtualNetwork new or existing
1 parent db8ae50 commit 556ebc6

File tree

11 files changed

+225
-216
lines changed

11 files changed

+225
-216
lines changed

‎resources/microsoft-pid.properties‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@ from.owls-141100-jdk8-ol87=5d011fae-34c1-4004-bd19-c2d2bccd30a4
113113
from.owls-141100-jdk8-ol91=9d76fbe1-3bbc-4a2b-a209-7427ad1db4ab
114114
from.owls-141100-jdk11-ol87=459c178d-aec6-4bb5-8e80-66291f0ee6a8
115115
from.owls-141100-jdk11-ol91=5ce9afe5-c458-41b6-9b46-4899cde11806
116+
from.owls-141200-jdk21-ol94=ce0ed319-7470-4b49-ba87-a3ebcf49b303
117+
from.owls-141200-jdk21-ol810=2d0a20a6-3022-4142-8f46-6f84af1adc66
118+
from.owls-141200-jdk17-ol94=d3acf02b-e8f3-41ca-9e62-1318ab0c023b
119+
from.owls-141200-jdk17-ol810=00d54634-1327-46bc-8a05-865aa648733d
116120

117121

118122
# Pids to indicate which latest base image was chosen. No difference in these

‎resources/pid.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,11 @@ from.owls-141100-jdk8-ol87=d58854b4-a612-4fbf-b095-f2d2178a88df
113113
from.owls-141100-jdk8-ol91=76d4dbe8-0679-4772-ad2e-461fac83dfd7
114114
from.owls-141100-jdk11-ol87=c8f1b07d-1660-4f6a-be97-3925645e8817
115115
from.owls-141100-jdk11-ol91=cd48f178-52a3-415e-88bb-caa45f615b94
116+
from.owls-141200-jdk21-ol94=6acfc3a0-6225-465f-9fa9-4d63ea81405b
117+
from.owls-141200-jdk21-ol810=69146c30-9c7e-4ce2-8642-eb8eb1b23cc5
118+
from.owls-141200-jdk17-ol94=a9a1c9b7-6c27-4086-b271-1ffd3c215390
119+
from.owls-141200-jdk17-ol810=69b6b433-1679-4d37-af25-3d56987c217a
120+
116121

117122
# Pids to indicate which latest base image was chosen. No difference in these
118123
# between Oracle and Microsoft

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,56 +15,60 @@
1515
"name": "skuUrnVersion",
1616
"type": "Microsoft.Common.DropDown",
1717
"label": "Oracle WebLogic Image",
18-
"defaultValue": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 9.1",
18+
"defaultValue": "WebLogic Server 14.1.2.0.0 and JDK 21 on Oracle Linux 9",
1919
"toolTip": "Choose Oracle WebLogic image, which is provided by Oracle, with Java and WebLogic preinstalled.",
2020
"constraints": {
2121
"allowedValues": [
2222
{
23-
"label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 9.1",
24-
"value": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest"
23+
"label": "WebLogic Server 14.1.2.0.0 and JDK 21 on Oracle Linux 9",
24+
"value": "owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest"
2525
},
2626
{
27-
"label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 8.7",
28-
"value": "owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest"
27+
"label": "WebLogic Server 14.1.2.0.0 and JDK 21 on Oracle Linux 8",
28+
"value": "owls-141200-jdk21-ol810;Oracle:weblogic-141200-jdk21-ol810:owls-141200-jdk21-ol810;latest"
2929
},
3030
{
31-
"label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 9.1",
32-
"value": "owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest"
31+
"label": "WebLogic Server 14.1.2.0.0 and JDK 17 on Oracle Linux 9",
32+
"value": "owls-141200-jdk17-ol94;Oracle:weblogic-141200-jdk17-ol94:owls-141200-jdk17-ol94;latest"
3333
},
3434
{
35-
"label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 8.7",
36-
"value": "owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest"
35+
"label": "WebLogic Server 14.1.2.0.0 and JDK 17 on Oracle Linux 8",
36+
"value": "owls-141200-jdk17-ol810;Oracle:weblogic-141200-jdk17-ol810:owls-141200-jdk17-ol810;latest"
3737
},
3838
{
39-
"label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 9.1",
40-
"value": "owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest"
39+
"label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 9",
40+
"value": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest"
4141
},
4242
{
43-
"label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 8.7",
44-
"value": "owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest"
43+
"label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 8",
44+
"value": "owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest"
4545
},
4646
{
47-
"label": "WebLogic Server 12.2.1.4.0 and JDK8 on Oracle Linux 7.6",
48-
"value": "owls-122140-jdk8-ol76;Oracle:weblogic-122140-jdk8-ol76:owls-122140-jdk8-ol7;latest"
47+
"label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 9",
48+
"value": "owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest"
4949
},
5050
{
51-
"label": "WebLogic Server 14.1.1.0.0 and JDK8 on Oracle Linux 7.6",
52-
"value": "owls-141100-jdk8-ol76;Oracle:weblogic-141100-jdk8-ol76:owls-141100-jdk8-ol7;latest"
51+
"label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 8",
52+
"value": "owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest"
5353
},
5454
{
55-
"label": "WebLogic Server 14.1.1.0.0 and JDK11 on Oracle Linux 7.6",
56-
"value": "owls-141100-jdk11-ol76;Oracle:weblogic-141100-jdk11-ol76:owls-141100-jdk11-ol7;latest"
55+
"label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 9",
56+
"value": "owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest"
57+
},
58+
{
59+
"label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 8",
60+
"value": "owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest"
5761
},
5862
{
59-
"label": "WebLogic Server 14.1.1.0.0 and JDK11 on Red Hat Enterprise Linux 8.7",
63+
"label": "WebLogic Server 14.1.1.0.0 and JDK11 on Red Hat Enterprise Linux 8",
6064
"value": "owls-141100-jdk11-rhel87;Oracle:weblogic-141100-jdk11-rhel87:owls-141100-jdk11-rhel87;latest"
6165
},
6266
{
63-
"label": "WebLogic Server 14.1.1.0.0 and JDK8 on Red Hat Enterprise Linux 8.7",
67+
"label": "WebLogic Server 14.1.1.0.0 and JDK8 on Red Hat Enterprise Linux 8",
6468
"value": "owls-141100-jdk8-rhel87;Oracle:weblogic-141100-jdk8-rhel87:owls-141100-jdk8-rhel87;latest"
6569
},
6670
{
67-
"label": "WebLogic Server 12.2.1.4.0 and JDK8 on Red Hat Enterprise Linux 8.7",
71+
"label": "WebLogic Server 12.2.1.4.0 and JDK8 on Red Hat Enterprise Linux 8",
6872
"value": "owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest"
6973
}
7074
],
@@ -1077,8 +1081,8 @@
10771081
"uploadedPrivateKeyAlias": "[steps('section_sslConfiguration').uploadedCustomSSLSettings.uploadedPrivateKeyAlias]",
10781082
"uploadedPrivateKeyPassPhrase": "[steps('section_sslConfiguration').uploadedCustomSSLSettings.uploadedPrivateKeyPassPhrase]",
10791083
"virtualNetworkName": "[steps('section_networkingConfiguration').virtualNetwork.name]",
1080-
"virtualNetworkResourceGroupName": "[steps('section_networkingConfiguration').virtualNetwork.resourceGroup]",
1084+
"virtualNetworkResourceGroupName": "[if(equals(steps('section_networkingConfiguration').virtualNetwork.newOrExisting, 'new'),resourceGroup().name,steps('section_networkingConfiguration').virtualNetwork.resourceGroup)]",
10811085
"virtualNetworkNewOrExisting": "[steps('section_networkingConfiguration').virtualNetwork.newOrExisting]"
10821086
}
10831087
}
1084-
}
1088+
}

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -249,23 +249,21 @@
249249
},
250250
"skuUrnVersion": {
251251
"type": "string",
252-
"defaultValue": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest",
252+
"defaultValue": "owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest",
253253
"allowedValues": [
254+
"owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest",
255+
"owls-141200-jdk21-ol810;Oracle:weblogic-141200-jdk21-ol810:owls-141200-jdk21-ol810;latest",
256+
"owls-141200-jdk17-ol94;Oracle:weblogic-141200-jdk17-ol94:owls-141200-jdk17-ol94;latest",
257+
"owls-141200-jdk17-ol810;Oracle:weblogic-141200-jdk17-ol810:owls-141200-jdk17-ol810;latest",
254258
"owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest",
255259
"owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest",
256260
"owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest",
257261
"owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest",
258262
"owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest",
259263
"owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest",
260-
"owls-122140-jdk8-ol76;Oracle:weblogic-122140-jdk8-ol76:owls-122140-jdk8-ol7;latest",
261-
"owls-141100-jdk8-ol76;Oracle:weblogic-141100-jdk8-ol76:owls-141100-jdk8-ol7;latest",
262-
"owls-141100-jdk11-ol76;Oracle:weblogic-141100-jdk11-ol76:owls-141100-jdk11-ol7;latest",
263264
"owls-141100-jdk11-rhel87;Oracle:weblogic-141100-jdk11-rhel87:owls-141100-jdk11-rhel87;latest",
264265
"owls-141100-jdk8-rhel87;Oracle:weblogic-141100-jdk8-rhel87:owls-141100-jdk8-rhel87;latest",
265-
"owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest",
266-
"owls-122140-jdk8-rhel76;Oracle:weblogic-122140-jdk8-rhel76:owls-122140-jdk8-rhel76;latest",
267-
"owls-141100-jdk8-rhel76;Oracle:weblogic-141100-jdk8-rhel76:owls-141100-jdk8-rhel76;latest",
268-
"owls-141100-jdk11-rhel76;Oracle:weblogic-141100-jdk11-rhel76:owls-141100-jdk11-rhel76;latest"
266+
"owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest"
269267
],
270268
"metadata": {
271269
"description": "The Oracle Linux image with Weblogic and Java preinstalled. Semicolon separated string of Sku, URN, and Version"

0 commit comments

Comments
 (0)