Skip to content

Commit 7c87932

Browse files
committed
Merge branch 'main_configclu' into 'main'
Fix intermittent nightly failure ItServerStartPolicyConfigCluster.testConfigDomainRollingRestart (main/release 4.2) See merge request weblogic-cloud/weblogic-kubernetes-operator!4945
2 parents 361f2cc + 15a52d2 commit 7c87932

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,19 +116,23 @@ void beforeEach() {
116116
domainUid, domainNamespace);
117117
}
118118

119-
// Check configured cluster configuration is available
119+
// Check standalone server configuration is available
120+
boolean isStandaloneServerConfigured =
121+
checkManagedServerConfiguration("standalone-managed", domainNamespace, adminServerPodName);
122+
assertTrue(isStandaloneServerConfigured,
123+
"Could not find standalone managed server from configured cluster");
124+
logger.info("Found standalone managed server configuratio");
125+
126+
// Check configured cluster configuration is available
127+
String configServerPodName = domainUid + "-config-cluster-server1";
128+
checkPodReadyAndServiceExists(configServerPodName,
129+
domainUid, domainNamespace);
120130
boolean isServerConfigured =
121131
checkManagedServerConfiguration("config-cluster-server1", domainNamespace, adminServerPodName);
122132
assertTrue(isServerConfigured,
123133
"Could not find managed server from configured cluster");
124134
logger.info("Found managed server from configured cluster");
125135

126-
// Check standalone server configuration is available
127-
boolean isStandaloneServerConfigured =
128-
checkManagedServerConfiguration("standalone-managed", domainNamespace, adminServerPodName);
129-
assertTrue(isStandaloneServerConfigured,
130-
"Could not find standalone managed server from configured cluster");
131-
logger.info("Found standalone managed server configuration");
132136
}
133137

134138
/**

0 commit comments

Comments
 (0)