Skip to content

Commit 3b8af41

Browse files
sankarpnjshum2479
sankarpn
authored and
jshum2479
committed
add operator log level
1 parent a7e0424 commit 3b8af41

File tree

8 files changed

+47
-2
lines changed

8 files changed

+47
-2
lines changed

‎Jenkinsfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ pipeline {
6767
description: 'Comma separated list of individual It test classes to be run e.g., ItParameterizedDomain, ItMiiUpdateDomainConfig, ItMiiDynamicUpdate*, ItMiiMultiMode',
6868
defaultValue: ''
6969
)
70+
string(name: 'OPERATOR_LOG_LEVEL',
71+
description: 'The default log level is not set',
72+
defaultValue: ''
73+
)
7074
choice(name: 'KIND_VERSION',
7175
description: 'Kind version.',
7276
choices: [
@@ -471,6 +475,7 @@ EOF
471475
echo "-Dwko.it.collect.logs.on.success=\"${COLLECT_LOGS_ON_SUCCESS}\"" >> ${WORKSPACE}/.mvn/maven.config
472476
echo "-Dwko.it.remoteconsole.version=\"${REMOTECONSOLE_VERSION}\"" >> ${WORKSPACE}/.mvn/maven.config
473477
echo "-Djdk.httpclient.allowRestrictedHeaders=\"host\"" >> ${WORKSPACE}/.mvn/maven.config
478+
echo "-DOPERATOR_LOG_LEVEL=\"${OPERATOR_LOG_LEVEL}\"" >> ${WORKSPACE}/.mvn/maven.config
474479
475480
476481
echo "${WORKSPACE}/.mvn/maven.config contents:"

‎Jenkinsfile.armoke

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ pipeline {
6464
defaultValue: ''
6565
)
6666

67+
string(name: 'OPERATOR_LOG_LEVEL',
68+
description: 'The default log level is not set',
69+
defaultValue: ''
70+
)
71+
6772
string(name: 'OKE_KUBE_VERSION',
6873
description: 'kube version for oke cluster',
6974
defaultValue: '1.27.2'
@@ -571,6 +576,7 @@ EOF
571576
echo "-Dwko.it.prometheus.chart.version=\"${PROMETHEUS_CHART_VERSION}\"" >> ${WORKSPACE}/.mvn/maven.config
572577
echo "-Dwko.it.grafana.chart.version=\"${GRAFANA_CHART_VERSION}\"" >> ${WORKSPACE}/.mvn/maven.config
573578
echo "-Dwko.it.collect.logs.on.success=\"${COLLECT_LOGS_ON_SUCCESS}\"" >> ${WORKSPACE}/.mvn/maven.config
579+
echo "-DOPERATOR_LOG_LEVEL=\"${OPERATOR_LOG_LEVEL}\"" >> ${WORKSPACE}/.mvn/maven.config
574580

575581
echo "${WORKSPACE}/.mvn/maven.config contents:"
576582
cat "${WORKSPACE}/.mvn/maven.config"

‎Jenkinsfile.kindnightly

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ pipeline {
9393
description: 'Comma separated list of individual It test classes to be run e.g., ItParameterizedDomain, ItMiiUpdateDomainConfig, ItMiiDynamicUpdate*, ItMiiMultiMode',
9494
defaultValue: ''
9595
)
96+
string(name: 'OPERATOR_LOG_LEVEL',
97+
description: 'The default log level is not set',
98+
defaultValue: ''
99+
)
96100
choice(name: 'KIND_VERSION',
97101
description: 'Kind version.',
98102
choices: [
@@ -507,6 +511,7 @@ EOF
507511
echo "-Dwko.it.collect.logs.on.success=\"${COLLECT_LOGS_ON_SUCCESS}\"" >> ${WORKSPACE}/.mvn/maven.config
508512
echo "-Dwko.it.remoteconsole.version=\"${REMOTECONSOLE_VERSION}\"" >> ${WORKSPACE}/.mvn/maven.config
509513
echo "-Djdk.httpclient.allowRestrictedHeaders=\"host\"" >> ${WORKSPACE}/.mvn/maven.config
514+
echo "-DOPERATOR_LOG_LEVEL=\"${OPERATOR_LOG_LEVEL}\"" >> ${WORKSPACE}/.mvn/maven.config
510515

511516

512517
echo "${WORKSPACE}/.mvn/maven.config contents:"

‎Jenkinsfile.ocne

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@ pipeline {
8888
defaultValue: ''
8989
)
9090

91+
string(name: 'OPERATOR_LOG_LEVEL',
92+
description: 'The default log level is not set',
93+
defaultValue: ''
94+
)
95+
9196
string(name: 'OCNE_KUBE_VERSION',
9297
description: 'kube version for OCNE cluster',
9398
defaultValue: '1.26.2'
@@ -429,6 +434,7 @@ EOF
429434
echo "-Dwko.it.grafana.chart.version=\"${GRAFANA_CHART_VERSION}\"" >> ${WORKSPACE}/.mvn/maven.config
430435
echo "-Dwko.it.collect.logs.on.success=\"${COLLECT_LOGS_ON_SUCCESS}\"" >> ${WORKSPACE}/.mvn/maven.config
431436
echo "-Dwko.it.remoteconsole.version=\"${REMOTECONSOLE_VERSION}\"" >> ${WORKSPACE}/.mvn/maven.config
437+
echo "-DOPERATOR_LOG_LEVEL=\"${OPERATOR_LOG_LEVEL}\"" >> ${WORKSPACE}/.mvn/maven.config
432438

433439
echo "${WORKSPACE}/.mvn/maven.config contents:"
434440
cat "${WORKSPACE}/.mvn/maven.config"

‎Jenkinsfile.oke

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ pipeline {
6868
defaultValue: ''
6969
)
7070

71+
string(name: 'OPERATOR_LOG_LEVEL',
72+
description: 'The default log level is not set',
73+
defaultValue: ''
74+
)
75+
7176
booleanParam(name: 'PARALLEL_RUN',
7277
description: 'Runs tests in parallel. Default is false.',
7378
defaultValue: false
@@ -601,7 +606,8 @@ EOF
601606
echo "-Dwko.it.grafana.chart.version=\"${GRAFANA_CHART_VERSION}\"" >> ${WORKSPACE}/.mvn/maven.config
602607
echo "-Dwko.it.collect.logs.on.success=\"${COLLECT_LOGS_ON_SUCCESS}\"" >> ${WORKSPACE}/.mvn/maven.config
603608
echo "-Dwko.it.remoteconsole.version=\"${REMOTECONSOLE_VERSION}\"" >> ${WORKSPACE}/.mvn/maven.config
604-
echo "-Djdk.httpclient.allowRestrictedHeaders=\"host\"" >> ${WORKSPACE}/.mvn/maven.config
609+
echo "-Djdk.httpclient.allowRestrictedHeaders=\"host\"" >> ${WORKSPACE}/.mvn/maven.config
610+
echo "-DOPERATOR_LOG_LEVEL=\"${OPERATOR_LOG_LEVEL}\"" >> ${WORKSPACE}/.mvn/maven.config
605611

606612
echo "${WORKSPACE}/.mvn/maven.config contents:"
607613
cat "${WORKSPACE}/.mvn/maven.config"

‎Jenkinsfile.okeext

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ pipeline {
5959
defaultValue: ''
6060
)
6161

62+
string(name: 'OPERATOR_LOG_LEVEL',
63+
description: 'The default log level is not set',
64+
defaultValue: ''
65+
)
66+
6267
string(name: 'KUBE_VERSION',
6368
description: 'kube version for oke cluster',
6469
defaultValue: '1.28.2'
@@ -533,6 +538,7 @@ EOF
533538
echo "-Dwko.it.grafana.chart.version=\"${GRAFANA_CHART_VERSION}\"" >> ${WORKSPACE}/.mvn/maven.config
534539
echo "-Dwko.it.collect.logs.on.success=\"${COLLECT_LOGS_ON_SUCCESS}\"" >> ${WORKSPACE}/.mvn/maven.config
535540
echo "-Dwko.it.remoteconsole.version=\"${REMOTECONSOLE_VERSION}\"" >> ${WORKSPACE}/.mvn/maven.config
541+
echo "-DOPERATOR_LOG_LEVEL=\"${OPERATOR_LOG_LEVEL}\"" >> ${WORKSPACE}/.mvn/maven.config
536542

537543
echo "${WORKSPACE}/.mvn/maven.config contents:"
538544
cat "${WORKSPACE}/.mvn/maven.config"

‎Jenkinsfile.podman

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ pipeline {
8282
description: 'Comma separated list of individual It test classes to be run e.g., ItParameterizedDomain, ItMiiUpdateDomainConfig, ItMiiDynamicUpdate*, ItMiiMultiMode',
8383
defaultValue: ''
8484
)
85+
string(name: 'OPERATOR_LOG_LEVEL',
86+
description: 'The default log level is not set',
87+
defaultValue: ''
88+
)
8589
choice(name: 'KIND_VERSION',
8690
description: 'Kind version.',
8791
choices: [
@@ -552,7 +556,8 @@ EOF
552556
echo "-Dwko.it.collect.logs.on.success=\"${COLLECT_LOGS_ON_SUCCESS}\"" >> ${WORKSPACE}/.mvn/maven.config
553557
echo "-DWLSIMG_BUILDER=\"podman\"" >> ${WORKSPACE}/.mvn/maven.config
554558
echo "-Dwko.it.remoteconsole.version=\"${REMOTECONSOLE_VERSION}\"" >> ${WORKSPACE}/.mvn/maven.config
555-
echo "-Djdk.httpclient.allowRestrictedHeaders=\"host\"" >> ${WORKSPACE}/.mvn/maven.config
559+
echo "-Djdk.httpclient.allowRestrictedHeaders=\"host\"" >> ${WORKSPACE}/.mvn/maven.config
560+
echo "-DOPERATOR_LOG_LEVEL=\"${OPERATOR_LOG_LEVEL}\"" >> ${WORKSPACE}/.mvn/maven.config
556561

557562
echo "${WORKSPACE}/.mvn/maven.config contents:"
558563
cat "${WORKSPACE}/.mvn/maven.config"

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/OperatorUtils.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,9 @@ public static OperatorParams installAndVerifyOperator(String opNamespace,
475475
.domainNamespaces(Arrays.asList(domainNamespace))
476476
.javaLoggingLevel(loggingLevel)
477477
.serviceAccount(opServiceAccount);
478+
if (System.getProperty("OPERATOR_LOG_LEVEL") != null && !System.getProperty("OPERATOR_LOG_LEVEL").isBlank()) {
479+
opParams.javaLoggingLevel(System.getProperty("OPERATOR_LOG_LEVEL").trim());
480+
}
478481

479482
if (webhookOnly) {
480483
opParams.webHookOnly(webhookOnly);
@@ -680,6 +683,9 @@ public static OperatorParams installAndVerifyOperator(String opNamespace,
680683
.domainNamespaces(Arrays.asList(domainNamespace))
681684
.javaLoggingLevel(loggingLevel)
682685
.serviceAccount(opServiceAccount);
686+
if (System.getProperty("OPERATOR_LOG_LEVEL") != null && !System.getProperty("OPERATOR_LOG_LEVEL").isBlank()) {
687+
opParams.javaLoggingLevel(System.getProperty("OPERATOR_LOG_LEVEL").trim());
688+
}
683689

684690
if (domainNamespaceSelectionStrategy != null) {
685691
opParams.domainNamespaceSelectionStrategy(domainNamespaceSelectionStrategy);

0 commit comments

Comments
 (0)