Skip to content

Commit cbbe524

Browse files
authored
remove ItDedicatedMode.java from olcne profile (#3950)
* remove olcne tag for ItDedicatedMode
1 parent 6e111ea commit cbbe524

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 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;
@@ -64,7 +64,6 @@
6464
@Tag("oke-sequential")
6565
@Tag("okd-wls-mrg")
6666
@IntegrationTest
67-
@Tag("olcne")
6867
class ItDedicatedMode {
6968
// namespace constants
7069
private static String opNamespace = null;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2022, 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;
@@ -132,7 +132,7 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
132132
* Make sure all 100 persistent messages are recovered form managed server(2)
133133
*/
134134
@Test
135-
@DisplayName("verifies persistent WebLogic data survies the server pod")
135+
@DisplayName("verifies persistent WebLogic data survives the server pod scaling")
136136
void testRecoveryDomainHomeInPv() {
137137

138138
final String managedServerNameBase = "managed-";

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2022, 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;
@@ -101,8 +101,8 @@ class ItValidateWebhookReplicas {
101101
private static String opNamespace = null;
102102
private static String domainNamespace = null;
103103
private static String domainNamespace2 = null;
104-
private static String domainUid = "domain1";
105-
private static String domainUid2 = "domain2";
104+
private static String domainUid = "valwebrepdomain1";
105+
private static String domainUid2 = "valwebrepdomain2";
106106

107107
private static String adminServerPodName = String.format("%s-%s", domainUid, ADMIN_SERVER_NAME_BASE);
108108
private static String managedServerPrefix = String.format("%s-%s", domainUid, MANAGED_SERVER_NAME_BASE);
@@ -695,7 +695,7 @@ private void restoreDomainImageAndReplicas(String domainUid, String domainNamesp
695695

696696
// check only managed server1 pod exists, all other managed server pods are deleted
697697
String managedServerPrefix = domainUid + "-" + MANAGED_SERVER_NAME_BASE;
698-
for (int i = DEFAULT_MAX_CLUSTER_SIZE + 1; i > 1; i--) {
698+
for (int i = DEFAULT_MAX_CLUSTER_SIZE; i > 1; i--) {
699699
checkPodDeleted(managedServerPrefix + i, domainUid, domainNamespace);
700700
}
701701
checkPodReadyAndServiceExists(managedServerPrefix + "1", domainUid, domainNamespace);

kubernetes/samples/scripts/common/utility.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
2+
# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44

55
#
@@ -855,7 +855,7 @@ checkPodDelete() {
855855
checkPodState() {
856856

857857
status="NotReady"
858-
max=60
858+
max=120
859859
count=1
860860

861861
pod=$1
@@ -880,7 +880,7 @@ checkPodState() {
880880
count=`expr $count + 1`
881881
done
882882
if [ $count -gt $max ] ; then
883-
echo "[ERROR] Unable to start the Pod [$pod] after 300s ";
883+
echo "[ERROR] Unable to start the Pod [$pod] after 600s ";
884884
exit 1
885885
fi
886886

0 commit comments

Comments
 (0)