Skip to content

Commit 66944a7

Browse files
committed
Merge branch 'movepar40' into 'release/4.0'
Backport move some of MonitoringExporter test classes to seq run, extended introspect timeout See merge request weblogic-cloud/weblogic-kubernetes-operator!4312
2 parents ab86c21 + 5142f72 commit 66944a7

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporterMetricsFiltering.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
@IntegrationTest
7878
@Tag("olcne")
7979
@Tag("oke-sequential")
80-
@Tag("kind-parallel")
80+
@Tag("kind-sequential")
8181
@Tag("okd-wls-mrg")
8282
class ItMonitoringExporterMetricsFiltering {
8383

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMonitoringExporterWebApp.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2021, 2023, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.weblogic.kubernetes;
@@ -92,7 +92,7 @@
9292
@IntegrationTest
9393
@Tag("olcne")
9494
@Tag("oke-sequential")
95-
@Tag("kind-parallel")
95+
@Tag("kind-sequential")
9696
@Tag("okd-wls-mrg")
9797
class ItMonitoringExporterWebApp {
9898

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public static DomainResource createDomainResource(
104104
.domainType("JRF")
105105
.runtimeEncryptionSecret(encryptionSecretName))
106106
.addSecretsItem(rcuAccessSecretName)
107-
.introspectorJobActiveDeadlineSeconds(600L)));
107+
.introspectorJobActiveDeadlineSeconds(900L)));
108108

109109
return domain;
110110
}

0 commit comments

Comments
 (0)