Skip to content

Commit 5b41a87

Browse files
committed
Merge branch 'okeconv42new' into 'release/4.2'
Increased timeout value for introspectorJobActiveDeadlineSeconds, moved some tests from OKE parallel to sequential See merge request weblogic-cloud/weblogic-kubernetes-operator!4752
2 parents 3624a00 + 49f0af6 commit 5b41a87

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+65
-57
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ private static void createDomainCrAndVerify(String adminSecretName, String domIm
357357
.configuration(new Configuration()
358358
.model(new Model()
359359
.domainType("WLS"))
360-
.introspectorJobActiveDeadlineSeconds(300L)));
360+
.introspectorJobActiveDeadlineSeconds(3000L)));
361361
setPodAntiAffinity(domain);
362362
logger.info("Create domain custom resource for domainUid {0} in namespace {1}",
363363
domainUid, domainNamespace);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ private static void createDomainResource(String domainUid, String domNamespace,
629629
.configuration(new Configuration()
630630
.model(new Model()
631631
.domainType("WLS"))
632-
.introspectorJobActiveDeadlineSeconds(300L)));
632+
.introspectorJobActiveDeadlineSeconds(3000L)));
633633
setPodAntiAffinity(domain);
634634
logger.info("Create domain custom resource for domainUid {0} in namespace {1}",
635635
domainUid, domNamespace);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ private DomainResource createDomainResourceWithConfigMap(String domainUid,
897897
.domainType("WLS")
898898
.configMap(configmapName)
899899
.runtimeEncryptionSecret(encryptionSecretName))
900-
.introspectorJobActiveDeadlineSeconds(introspectorDeadline != null ? introspectorDeadline : 300L)));
900+
.introspectorJobActiveDeadlineSeconds(introspectorDeadline != null ? introspectorDeadline : 3000L)));
901901
setPodAntiAffinity(domain);
902902

903903

@@ -944,7 +944,7 @@ private DomainResource createDomainResource(String domainUid, String domNamespac
944944
.model(new Model()
945945
.domainType("WLS")
946946
.runtimeEncryptionSecret(encryptionSecretName))
947-
.introspectorJobActiveDeadlineSeconds(300L)));
947+
.introspectorJobActiveDeadlineSeconds(3000L)));
948948
setPodAntiAffinity(domain);
949949

950950
ClusterResource cluster = createClusterResource(clusterResName, wlClusterName, domNamespace, replicaCount);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ private static void createDomainCrAndVerify(String adminSecretName,
442442
.model(new Model()
443443
.domainType("WLS")
444444
.runtimeEncryptionSecret(encryptionSecretName))
445-
.introspectorJobActiveDeadlineSeconds(300L)));
445+
.introspectorJobActiveDeadlineSeconds(3000L)));
446446

447447
// create cluster resource
448448
if (!Cluster.doesClusterExist(clusterName, CLUSTER_VERSION, domainNamespace)) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ private static void createDomainResource(
716716
.domainType("WLS")
717717
.configMap(configmapName)
718718
.runtimeEncryptionSecret(encryptionSecretName))
719-
.introspectorJobActiveDeadlineSeconds(300L)));
719+
.introspectorJobActiveDeadlineSeconds(3000L)));
720720
setPodAntiAffinity(domain);
721721
logger.info("Create domain custom resource for domainUid {0} in namespace {1}",
722722
domainUid, domNamespace);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ private void createAndVerifyMiiDomain(String domainNamespace, String domainUid,
354354
.channelName("default")
355355
.nodePort(0))))
356356
.configuration(new Configuration()
357+
.introspectorJobActiveDeadlineSeconds(3000L)
357358
.model(new Model()
358359
.domainType(WLS_DOMAIN_TYPE)
359360
.runtimeEncryptionSecret(encryptionSecretName))));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1482,7 +1482,7 @@ private DomainResource createDomainResourceWithConfigMap(String domainUid, Strin
14821482
.domainType("WLS")
14831483
.configMap(configmapName)
14841484
.runtimeEncryptionSecret(encryptionSecretName))
1485-
.introspectorJobActiveDeadlineSeconds(introspectorDeadline != null ? introspectorDeadline : 300L)));
1485+
.introspectorJobActiveDeadlineSeconds(introspectorDeadline != null ? introspectorDeadline : 3000L)));
14861486
setPodAntiAffinity(domain);
14871487

14881488

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ private static void createDomainCrAndVerify(String adminSecretName, String domIm
343343
.configuration(new Configuration()
344344
.model(new Model()
345345
.domainType("WLS"))
346-
.introspectorJobActiveDeadlineSeconds(300L)));
346+
.introspectorJobActiveDeadlineSeconds(3000L)));
347347
setPodAntiAffinity(domain);
348348
logger.info("Create domain custom resource for domainUid {0} in namespace {1}",
349349
domainUid, domainNamespace);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ private static void createDomainResource(String domainUid, String domNamespace,
630630
.configuration(new Configuration()
631631
.model(new Model()
632632
.domainType("WLS"))
633-
.introspectorJobActiveDeadlineSeconds(300L)));
633+
.introspectorJobActiveDeadlineSeconds(3000L)));
634634
setPodAntiAffinity(domain);
635635
logger.info("Create domain custom resource for domainUid {0} in namespace {1}",
636636
domainUid, domNamespace);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ private static DomainResource createDomainResourceWithLogHome(
605605
.runtimeEncryptionSecret(encryptionSecretName)
606606
.onlineUpdate(new OnlineUpdate()
607607
.enabled(onlineUpdateEnabled)))
608-
.introspectorJobActiveDeadlineSeconds(300L));
608+
.introspectorJobActiveDeadlineSeconds(3000L));
609609

610610
if (setDataHome) {
611611
domainSpec.dataHome("/shared/data");

0 commit comments

Comments
 (0)