Skip to content

Commit 7f99141

Browse files
robertpatrickrobertpatrick
committed
Merge branch 'more-aliases' into 'main'
Fixing aliases and delaying nightly build to allow 14.1.2 nightly job to complete first See merge request weblogic-cloud/weblogic-deploy-tooling!1651
2 parents 9b078cb + 00ee629 commit 7f99141

File tree

5 files changed

+47
-38
lines changed

5 files changed

+47
-38
lines changed

‎Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pipeline {
1010
}
1111
triggers {
1212
// timer trigger for "nightly build" on main branch
13-
cron( env.BRANCH_NAME.equals('main') ? 'H H(0-3) * * 1-5' : '')
13+
cron( env.BRANCH_NAME.equals('main') ? 'H H(2-3) * * 1-5' : '')
1414
}
1515
stages {
1616
stage ('Environment') {

‎core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Cluster.json

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,11 @@
143143
"default_name_value": "${NO_NAME_0:%CLUSTER%}",
144144
"folders" : {},
145145
"attributes" : {
146-
"MaxStuckThreadTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxStuckThreadTime", "wlst_path": "WP001", "default_value": 600, "wlst_type": "integer" } ],
147-
"StuckThreadCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StuckThreadCount", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer", "get_method": "GET" } ],
148-
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
146+
"HeapDumpingOnDeadlock": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "HeapDumpingOnDeadlock", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ],
147+
"HeapDumpingOnMaxStuckThread": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "HeapDumpingOnMaxStuckThread", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ],
148+
"MaxStuckThreadTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxStuckThreadTime", "wlst_path": "WP001", "default_value": 600, "wlst_type": "integer" } ],
149+
"StuckThreadCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StuckThreadCount", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer", "get_method": "GET" } ],
150+
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
149151
},
150152
"wlst_attributes_path": "WP001",
151153
"wlst_paths": {
@@ -154,14 +156,14 @@
154156
}
155157
},
156158
"attributes" : {
157-
"FailureAction": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FailureAction", "wlst_path": "WP001", "default_value": "${__NULL__:no-action}", "derived_default": "${:true}", "wlst_type": "string" } ],
158-
"FreeMemoryPercentHighThreshold": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FreeMemoryPercentHighThreshold", "wlst_path": "WP001", "default_value": 0, "derived_default": "${:true}", "wlst_type": "integer" } ],
159-
"FreeMemoryPercentLowThreshold": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FreeMemoryPercentLowThreshold", "wlst_path": "WP001", "default_value": 0, "derived_default": "${:true}", "wlst_type": "integer" } ],
160-
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
161-
"PanicAction": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "PanicAction", "wlst_path": "WP001", "default_value": "${__NULL__:no-action}", "derived_default": "${:true}", "wlst_type": "string" } ,
162-
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "PanicAction", "wlst_path": "WP001", "default_value": "${__NULL__:system-exit}", "derived_default": "${:true}", "wlst_type": "string" } ],
163-
"ServerFailureTrigger": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "ServerFailureTrigger", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED", "comment": "Appears in attribute list until ServerFailureTrigger folder is created"} ],
164-
"SharedCapacityForWorkManagers": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SharedCapacityForWorkManagers", "wlst_path": "WP001", "default_value": 65536, "derived_default": "${:true}", "wlst_type": "integer" } ]
159+
"FailureAction": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FailureAction", "wlst_path": "WP001", "default_value": "${__NULL__:no-action}", "derived_default": "${:true}", "wlst_type": "string" } ],
160+
"FreeMemoryPercentHighThreshold": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FreeMemoryPercentHighThreshold", "wlst_path": "WP001", "default_value": 0, "derived_default": "${:true}", "wlst_type": "integer" } ],
161+
"FreeMemoryPercentLowThreshold": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FreeMemoryPercentLowThreshold", "wlst_path": "WP001", "default_value": 0, "derived_default": "${:true}", "wlst_type": "integer" } ],
162+
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
163+
"PanicAction": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "PanicAction", "wlst_path": "WP001", "default_value": "${__NULL__:no-action}", "derived_default": "${:true}", "wlst_type": "string" } ,
164+
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "PanicAction", "wlst_path": "WP001", "default_value": "${__NULL__:system-exit}", "derived_default": "${:true}", "wlst_type": "string" } ],
165+
"ServerFailureTrigger": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "ServerFailureTrigger", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED", "comment": "Appears in attribute list until ServerFailureTrigger folder is created"} ],
166+
"SharedCapacityForWorkManagers": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SharedCapacityForWorkManagers", "wlst_path": "WP001", "default_value": 65536, "derived_default": "${:true}", "wlst_type": "integer" } ]
165167

166168
},
167169
"wlst_attributes_path": "WP001",

‎core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CoherenceClusterSystemResource.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,11 @@
235235
"default_name_value": "${NO_NAME_0:%COHERENCECLUSTER%}",
236236
"folders": {},
237237
"attributes": {
238-
"Enabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "default_value": "${__NULL__:true}", "wlst_type": "boolean"} ],
239-
"LoggerName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "LoggerName", "wlst_path": "WP001", "default_value": "${__NULL__:com.oracle.coherence}", "wlst_type": "string" } ],
240-
"MessageFormat": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "MessageFormat", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "get_method": "LSA" },
241-
{"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "MessageFormat", "wlst_path": "WP001", "default_value": "{date}/{uptime} {product} {version} <{level}> (thread={thread}, member={member}): {text}", "wlst_type": "string", "get_method": "GET" } ],
238+
"CharacterLimit": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "CharacterLimit", "wlst_path": "WP001", "default_value": 1048576, "wlst_type": "integer"} ],
239+
"Enabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "default_value": "${__NULL__:true}", "wlst_type": "boolean"} ],
240+
"LoggerName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "LoggerName", "wlst_path": "WP001", "default_value": "${__NULL__:com.oracle.coherence}", "wlst_type": "string" } ],
241+
"MessageFormat": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "MessageFormat", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "get_method": "LSA" },
242+
{"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "MessageFormat", "wlst_path": "WP001", "default_value": "{date}/{uptime} {product} {version} <{level}> (thread={thread}, member={member}): {text}", "wlst_type": "string", "get_method": "GET" } ],
242243
"SeverityLevel": [
243244
{"version": "[12.2.1.4.0.221210,14.1.1)", "wlst_mode": "online", "wlst_name": "SeverityLevel", "wlst_path": "WP001", "default_value": 5, "wlst_type": "integer" } ,
244245
{"version": "[14.1.1.0.0.221213,)", "wlst_mode": "online", "wlst_name": "SeverityLevel", "wlst_path": "WP001", "default_value": 5, "wlst_type": "integer" },

‎core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -445,9 +445,11 @@
445445
"default_name_value": "${NO_NAME_0:%SERVER%}",
446446
"folders": {},
447447
"attributes": {
448-
"MaxStuckThreadTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxStuckThreadTime", "wlst_path": "WP001", "default_value": 600, "wlst_type": "integer"} ],
449-
"StuckThreadCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StuckThreadCount", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer", "get_method": "GET"} ],
450-
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
448+
"HeapDumpingOnDeadlock": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "HeapDumpingOnDeadlock", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ],
449+
"HeapDumpingOnMaxStuckThread": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "HeapDumpingOnMaxStuckThread", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ],
450+
"MaxStuckThreadTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxStuckThreadTime", "wlst_path": "WP001", "default_value": 600, "wlst_type": "integer"} ],
451+
"StuckThreadCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StuckThreadCount", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer", "get_method": "GET"} ],
452+
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
451453
},
452454
"wlst_attributes_path": "WP001",
453455
"wlst_paths": {
@@ -456,14 +458,14 @@
456458
}
457459
},
458460
"attributes": {
459-
"FailureAction": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FailureAction", "wlst_path": "WP001", "default_value": "${__NULL__:no-action}", "derived_default": "${:true}", "wlst_type": "string" } ],
460-
"FreeMemoryPercentHighThreshold": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FreeMemoryPercentHighThreshold", "wlst_path": "WP001", "default_value": 0, "derived_default": "${:true}", "wlst_type": "integer"} ],
461-
"FreeMemoryPercentLowThreshold": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FreeMemoryPercentLowThreshold", "wlst_path": "WP001", "default_value": 0, "derived_default": "${:true}", "wlst_type": "integer"} ],
462-
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
463-
"PanicAction": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "PanicAction", "wlst_path": "WP001", "default_value": "${__NULL__:no-action}", "derived_default": "${:true}", "wlst_type": "string" } ,
464-
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "PanicAction", "wlst_path": "WP001", "default_value": "${__NULL__:system-exit}", "derived_default": "${:true}", "wlst_type": "string" } ],
465-
"ServerFailureTrigger": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "ServerFailureTrigger", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED", "comment": "Appears in attribute list until ServerFailureTrigger folder is created"} ],
466-
"SharedCapacityForWorkManagers": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SharedCapacityForWorkManagers", "wlst_path": "WP001", "default_value": 65536, "derived_default": "${:true}", "wlst_type": "integer"} ]
461+
"FailureAction": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FailureAction", "wlst_path": "WP001", "default_value": "${__NULL__:no-action}", "derived_default": "${:true}", "wlst_type": "string" } ],
462+
"FreeMemoryPercentHighThreshold": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FreeMemoryPercentHighThreshold", "wlst_path": "WP001", "default_value": 0, "derived_default": "${:true}", "wlst_type": "integer"} ],
463+
"FreeMemoryPercentLowThreshold": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FreeMemoryPercentLowThreshold", "wlst_path": "WP001", "default_value": 0, "derived_default": "${:true}", "wlst_type": "integer"} ],
464+
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
465+
"PanicAction": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "PanicAction", "wlst_path": "WP001", "default_value": "${__NULL__:no-action}", "derived_default": "${:true}", "wlst_type": "string" } ,
466+
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "PanicAction", "wlst_path": "WP001", "default_value": "${__NULL__:system-exit}", "derived_default": "${:true}", "wlst_type": "string" } ],
467+
"ServerFailureTrigger": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "ServerFailureTrigger", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED", "comment": "Appears in attribute list until ServerFailureTrigger folder is created"} ],
468+
"SharedCapacityForWorkManagers": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SharedCapacityForWorkManagers", "wlst_path": "WP001", "default_value": 65536, "derived_default": "${:true}", "wlst_type": "integer"} ]
467469
},
468470
"wlst_attributes_path": "WP001",
469471
"wlst_paths": {
@@ -839,6 +841,7 @@
839841
"DebugMessagingBridgeStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugMessagingBridgeStartup", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
840842
"DebugMessagingKernel": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugMessagingKernel", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
841843
"DebugMessagingKernelBoot": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugMessagingKernelBoot", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
844+
"DebugMessagingKernelVerbose": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "DebugMessagingKernelVerbose", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
842845
"DebugMessagingOwnableLock": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DebugMessagingOwnableLock", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
843846
"DebugMigrationInfo": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DebugMigrationInfo", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "get_method": "${LSA:GET}"} ],
844847
"DebugMuxer": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugMuxer", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],

0 commit comments

Comments
 (0)