Skip to content

Commit af194fb

Browse files
rjeberhardrjeberhard
committed
Merge branch 'xc-112369-42' into 'release/4.2'
Fix test failures in crio-pipeline and OCNE with podman See merge request weblogic-cloud/weblogic-kubernetes-operator!4846
2 parents 3d5dbb1 + 8b2fdd3 commit af194fb

13 files changed

+133
-87
lines changed

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_APP_NAME;
6464
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
6565
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
66+
import static oracle.weblogic.kubernetes.TestConstants.SKIP_CLEANUP;
6667
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
6768
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
6869
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
@@ -714,6 +715,7 @@ void testIntrospectorTimeoutFailure() {
714715
* type: Completed, status: false
715716
*/
716717
@DisabledIfEnvironmentVariable(named = "ARM", matches = "true")
718+
@DisabledIfEnvironmentVariable(named = "OCNE", matches = "true")
717719
@Test
718720
@DisplayName("Test domain status condition with managed server boot failure.")
719721
void testMSBootFailureStatus() {
@@ -850,11 +852,13 @@ rcuSchemaPrefix, domainNamespace, getNextFreePort(), dbUrl, dbListenerPort),
850852
if (!testPassed) {
851853
LoggingUtil.generateLog(this, ns);
852854
}
853-
if (assertDoesNotThrow(() -> clusterExists(clusterResName, CLUSTER_VERSION, domainNamespace).call())) {
854-
deleteClusterCustomResource(clusterResName, domainNamespace);
855-
}
856-
if (assertDoesNotThrow(() -> domainExists(domainName, DOMAIN_VERSION, domainNamespace).call())) {
857-
deleteDomainResource(domainNamespace, domainName);
855+
if (!SKIP_CLEANUP) {
856+
if (assertDoesNotThrow(() -> clusterExists(clusterResName, CLUSTER_VERSION, domainNamespace).call())) {
857+
deleteClusterCustomResource(clusterResName, domainNamespace);
858+
}
859+
if (assertDoesNotThrow(() -> domainExists(domainName, DOMAIN_VERSION, domainNamespace).call())) {
860+
deleteDomainResource(domainNamespace, domainName);
861+
}
858862
}
859863
}
860864
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
@IntegrationTest
8181
@Tag("oke-parallel")
8282
@Tag("kind-parallel")
83-
@Tag("olcne-mrg")
8483
class ItIstioMonitoringExporter {
8584

8685
private static String opNamespace = null;
@@ -254,8 +253,7 @@ private void deployPrometheusAndVerify(String domainNamespace, String domainUid,
254253
"Can't modify Prometheus CM, not possible to monitor " + domainUid);
255254
}
256255

257-
checkMetricsViaPrometheus(searchKey, "sessmigr",
258-
hostPortPrometheus);
256+
checkMetricsViaPrometheus(searchKey, "sessmigr", hostPortPrometheus);
259257
}
260258

261259
@AfterAll

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,13 @@
3131
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
3232
import static oracle.weblogic.kubernetes.TestConstants.KIND_CLUSTER;
3333
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
34+
import static oracle.weblogic.kubernetes.TestConstants.OCNE;
3435
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE_DIR;
3536
import static oracle.weblogic.kubernetes.TestConstants.SKIP_CLEANUP;
3637
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTPS_HOSTPORT;
38+
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTPS_NODEPORT;
3739
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
40+
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_NODEPORT;
3841
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
3942
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER_DEFAULT;
4043
import static oracle.weblogic.kubernetes.actions.TestActions.deletePersistentVolume;
@@ -276,6 +279,8 @@ private static void createTraefikIngressRoutingRules(String domainNamespace) {
276279
private int getTraefikLbNodePort(boolean isHttps) {
277280
if (KIND_CLUSTER && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
278281
return isHttps ? TRAEFIK_INGRESS_HTTPS_HOSTPORT : TRAEFIK_INGRESS_HTTP_HOSTPORT;
282+
} else if (OCNE && !WLSIMG_BUILDER.equals(WLSIMG_BUILDER_DEFAULT)) {
283+
return isHttps ? TRAEFIK_INGRESS_HTTPS_NODEPORT : TRAEFIK_INGRESS_HTTP_NODEPORT;
279284
} else if (traefikHelmParams != null) {
280285
logger.info("Getting web node port for Traefik loadbalancer {0}", traefikHelmParams.getReleaseName());
281286
return assertDoesNotThrow(() ->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ void testUpdateBaseImageName() {
412412
String imageTag = getDateAndTimeStamp();
413413
String imageUpdate = KIND_REPO != null ? KIND_REPO
414414
+ (WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag).substring(TestConstants.BASE_IMAGES_REPO.length() + 1)
415-
: DOMAIN_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag;
415+
: DOMAIN_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT + "-dev:" + imageTag;
416416
imageTag(imageName, imageUpdate);
417417
imageRepoLoginAndPushImageToRegistry(imageUpdate);
418418

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
3030
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
3131
import static oracle.weblogic.kubernetes.TestConstants.MII_DYNAMIC_UPDATE_EXPECTED_ERROR_MSG;
32+
import static oracle.weblogic.kubernetes.TestConstants.OCNE;
3233
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
3334
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_RELEASE_NAME;
3435
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
@@ -327,7 +328,7 @@ void testMiiChangeDataSourceParameterWithCommitUpdateAndRoll() {
327328
verifyPodIntrospectVersionUpdated(pods.keySet(), introspectVersion, helper.domainNamespace);
328329

329330
// check datasource configuration using REST api
330-
if (OKE_CLUSTER) {
331+
if (OKE_CLUSTER || OCNE) {
331332
assertTrue(checkSystemResourceConfigViaAdminPod(helper.adminServerPodName, helper.domainNamespace,
332333
"JDBCSystemResources/TestDataSource2/JDBCResource/JDBCDataSourceParams",
333334
"jdbc\\/TestDataSource2-2"), "JDBCSystemResource JNDIName not found");

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

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
5555
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
5656
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
57+
import static oracle.weblogic.kubernetes.TestConstants.OCNE;
5758
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
5859
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
5960
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
@@ -279,8 +280,12 @@ void testMiiCustomEnv() {
279280
int adminServiceNodePort
280281
= getServiceNodePort(domainNamespace, getExternalServicePodName(adminServerPodName), "default");
281282

282-
String hostAndPort =
283-
OKE_CLUSTER ? adminServerPodName + ":7001" : getHostAndPort(adminSvcExtHost, adminServiceNodePort);
283+
String hostAndPort;
284+
if (OKE_CLUSTER || OCNE) {
285+
hostAndPort = adminServerPodName + ":7001";
286+
} else {
287+
hostAndPort = getHostAndPort(adminSvcExtHost, adminServiceNodePort);
288+
}
284289

285290
// use traefik LB for kind cluster with ingress host header in url
286291
String headers = "";
@@ -302,7 +307,7 @@ void testMiiCustomEnv() {
302307
.append("?fields=notes&links=none\"")
303308
.append(" --silent ").toString();
304309

305-
if (OKE_CLUSTER) {
310+
if (OKE_CLUSTER || OCNE) {
306311
curlString = KUBERNETES_CLI + " exec -n " + domainNamespace + " " + adminServerPodName + " -- " + curlString;
307312
}
308313

@@ -372,7 +377,7 @@ void testMiiCheckSystemResources() {
372377
= getServiceNodePort(domainNamespace, getExternalServicePodName(adminServerPodName), "default");
373378
assertNotEquals(-1, adminServiceNodePort, "admin server default node port is not valid");
374379

375-
if (OKE_CLUSTER) {
380+
if (OKE_CLUSTER || OCNE) {
376381
String resourcePath = "/management/weblogic/latest/domainConfig/JDBCSystemResources/TestDataSource";
377382
ExecResult result = exeAppInServerPod(domainNamespace, adminServerPodName,7001, resourcePath);
378383
assertEquals(0, result.exitValue(), "Failed to find the JDBCSystemResource configuration");
@@ -477,7 +482,7 @@ void testMiiDeleteSystemResources() {
477482
checkServiceExists(managedServerPrefix + i, domainNamespace);
478483
}
479484

480-
if (OKE_CLUSTER) {
485+
if (OKE_CLUSTER || OCNE) {
481486
String resourcePath = "/management/weblogic/latest/domainConfig/JDBCSystemResources/TestDataSource";
482487
ExecResult result = exeAppInServerPod(domainNamespace, adminServerPodName, 7001, resourcePath);
483488
assertEquals(0, result.exitValue(), "Failed to delete the JDBCSystemResource configuration");
@@ -557,7 +562,7 @@ void testMiiAddSystemResources() {
557562
checkServiceExists(managedServerPrefix + i, domainNamespace);
558563
}
559564

560-
if (OKE_CLUSTER) {
565+
if (OKE_CLUSTER || OCNE) {
561566
String resourcePath = "/management/weblogic/latest/domainConfig/JDBCSystemResources/TestDataSource2";
562567
ExecResult result = exeAppInServerPod(domainNamespace, adminServerPodName, 7001, resourcePath);
563568
assertEquals(0, result.exitValue(), "Failed to find the JDBCSystemResource configuration");
@@ -892,7 +897,7 @@ void testMiiDeleteSystemResourcesByEmptyConfigMap() {
892897
checkServiceExists(managedServerPrefix + i, domainNamespace);
893898
}
894899

895-
if (OKE_CLUSTER) {
900+
if (OKE_CLUSTER || OCNE) {
896901
String resourcePath = "/management/weblogic/latest/domainConfig/JDBCSystemResources/TestDataSource";
897902
ExecResult result = exeAppInServerPod(domainNamespace, adminServerPodName, 7001, resourcePath);
898903
assertEquals(0, result.exitValue(), "Failed to delete the JDBCSystemResource configuration");
@@ -1024,8 +1029,12 @@ private static DomainResource createDomainResource(
10241029
private void verifyManagedServerConfiguration(String managedServer) {
10251030
int adminServiceNodePort
10261031
= getServiceNodePort(domainNamespace, getExternalServicePodName(adminServerPodName), "default");
1027-
String hostAndPort =
1028-
OKE_CLUSTER ? adminServerPodName + ":7001" : getHostAndPort(adminSvcExtHost, adminServiceNodePort);
1032+
String hostAndPort;
1033+
if (OKE_CLUSTER || OCNE) {
1034+
hostAndPort = adminServerPodName + ":7001";
1035+
} else {
1036+
hostAndPort = getHostAndPort(adminSvcExtHost, adminServiceNodePort);
1037+
}
10291038

10301039
// use traefik LB for kind cluster with ingress host header in url
10311040
String headers = "";
@@ -1047,7 +1056,7 @@ private void verifyManagedServerConfiguration(String managedServer) {
10471056

10481057
StringBuffer checkCluster = new StringBuffer();
10491058

1050-
if (OKE_CLUSTER) {
1059+
if (OKE_CLUSTER || OCNE) {
10511060
checkCluster = new StringBuffer(KUBERNETES_CLI)
10521061
.append(" exec -n ")
10531062
.append(domainNamespace)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
*/
9090
@DisplayName("Verify WebLogic Metric is processed and filtered as expected by MonitoringExporter")
9191
@IntegrationTest
92-
@Tag("olcne-mrg")
9392
@Tag("oke-sequential")
9493
@Tag("kind-sequential")
9594
@Tag("okd-wls-mrg")

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

Lines changed: 54 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
3131
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
3232
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_WDT_MODEL_FILE;
33+
import static oracle.weblogic.kubernetes.TestConstants.OCNE;
3334
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_HTTP_HOSTPORT;
3435
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
3536
import static oracle.weblogic.kubernetes.actions.ActionConstants.ARCHIVE_DIR;
@@ -148,60 +149,63 @@ public static void initAll(@Namespaces(5) List<String> namespaces) {
148149
+ "verify admin server is accessible via REST interface.")
149150
@ValueSource(strings = {"modelInImage", "domainInImage", "domainOnPV", "auxiliaryImageDomain"})
150151
void testScaleClustersAndAdminRESTAccess(String domainType) {
151-
DomainResource domain = createDomainBasedOnDomainType(domainType);
152-
153-
// get the domain properties
154-
String domainUid = domain.getSpec().getDomainUid();
155-
String domainNamespace = domain.getMetadata().getNamespace();
156-
157-
String dynamicServerPodName = domainUid + "-managed-server1";
158-
OffsetDateTime dynTs = getPodCreationTime(domainNamespace, dynamicServerPodName);
159-
final String managedServerPrefix = domainUid + "-managed-server";
160-
int numberOfServers = 3;
161-
logger.info("Scaling cluster {0} of domain {1} in namespace {2} to {3} servers.",
162-
clusterName, domainUid, domainNamespace, numberOfServers);
163-
assertDoesNotThrow(() -> scaleCluster(clusterName,domainNamespace,
164-
numberOfServers), "Could not scale up the cluster");
165-
// check managed server pods are ready
166-
for (int i = 1; i <= numberOfServers; i++) {
167-
logger.info("Wait for managed server pod {0} to be ready in namespace {1}",
168-
managedServerPrefix + i, domainNamespace);
169-
checkPodReadyAndServiceExists(managedServerPrefix + i, domainUid, domainNamespace);
170-
}
152+
// workaround OWLS-122679
153+
if (!(OCNE && domainType.equals("domainInImage"))) {
154+
DomainResource domain = createDomainBasedOnDomainType(domainType);
155+
156+
// get the domain properties
157+
String domainUid = domain.getSpec().getDomainUid();
158+
String domainNamespace = domain.getMetadata().getNamespace();
159+
160+
String dynamicServerPodName = domainUid + "-managed-server1";
161+
OffsetDateTime dynTs = getPodCreationTime(domainNamespace, dynamicServerPodName);
162+
final String managedServerPrefix = domainUid + "-managed-server";
163+
int numberOfServers = 3;
164+
logger.info("Scaling cluster {0} of domain {1} in namespace {2} to {3} servers.",
165+
clusterName, domainUid, domainNamespace, numberOfServers);
166+
assertDoesNotThrow(() -> scaleCluster(clusterName, domainNamespace,
167+
numberOfServers), "Could not scale up the cluster");
168+
// check managed server pods are ready
169+
for (int i = 1; i <= numberOfServers; i++) {
170+
logger.info("Wait for managed server pod {0} to be ready in namespace {1}",
171+
managedServerPrefix + i, domainNamespace);
172+
checkPodReadyAndServiceExists(managedServerPrefix + i, domainUid, domainNamespace);
173+
}
171174

172-
Callable<Boolean> isDynRestarted =
173-
assertDoesNotThrow(() -> isPodRestarted(dynamicServerPodName, domainNamespace, dynTs));
174-
assertFalse(assertDoesNotThrow(isDynRestarted::call),
175-
"Dynamic managed server pod must not be restated");
176-
177-
// then scale cluster back to 1 server
178-
logger.info("Scaling back cluster {0} of domain {1} in namespace {2} from {3} servers to {4} servers.",
179-
clusterName, domainUid, domainNamespace,numberOfServers,replicaCount);
180-
assertDoesNotThrow(() -> scaleCluster(clusterName, domainNamespace,
181-
replicaCount), "Could not scale down the cluster");
182-
183-
for (int i = numberOfServers; i > replicaCount; i--) {
184-
logger.info("Wait for managed server pod {0} to be deleted in namespace {1}",
185-
managedServerPrefix + i, domainNamespace);
186-
checkPodDeleted(managedServerPrefix + i, domainUid, domainNamespace);
187-
}
175+
Callable<Boolean> isDynRestarted =
176+
assertDoesNotThrow(() -> isPodRestarted(dynamicServerPodName, domainNamespace, dynTs));
177+
assertFalse(assertDoesNotThrow(isDynRestarted::call),
178+
"Dynamic managed server pod must not be restated");
179+
180+
// then scale cluster back to 1 server
181+
logger.info("Scaling back cluster {0} of domain {1} in namespace {2} from {3} servers to {4} servers.",
182+
clusterName, domainUid, domainNamespace, numberOfServers, replicaCount);
183+
assertDoesNotThrow(() -> scaleCluster(clusterName, domainNamespace,
184+
replicaCount), "Could not scale down the cluster");
185+
186+
for (int i = numberOfServers; i > replicaCount; i--) {
187+
logger.info("Wait for managed server pod {0} to be deleted in namespace {1}",
188+
managedServerPrefix + i, domainNamespace);
189+
checkPodDeleted(managedServerPrefix + i, domainUid, domainNamespace);
190+
}
188191

189-
logger.info("Validating WebLogic admin server access by REST");
190-
if (!TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
191-
hostHeader = createIngressHostRouting(domainNamespace, domainUid, adminServerName, 7001);
192-
assertDoesNotThrow(()
193-
-> verifyAdminServerRESTAccess("localhost", TRAEFIK_INGRESS_HTTP_HOSTPORT, false, hostHeader));
194-
} else {
195-
String adminServerPodName = domainUid + "-" + ADMIN_SERVER_NAME_BASE;
196-
try {
197-
verifyAdminServerRESTAccessInAdminPod(adminServerPodName, "7001",
198-
domainNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT);
199-
} catch (IOException ex) {
200-
logger.severe(ex.getMessage());
192+
logger.info("Validating WebLogic admin server access by REST");
193+
if (!TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
194+
hostHeader = createIngressHostRouting(domainNamespace, domainUid, adminServerName, 7001);
195+
assertDoesNotThrow(()
196+
-> verifyAdminServerRESTAccess("localhost", TRAEFIK_INGRESS_HTTP_HOSTPORT, false, hostHeader));
197+
} else {
198+
String adminServerPodName = domainUid + "-" + ADMIN_SERVER_NAME_BASE;
199+
try {
200+
verifyAdminServerRESTAccessInAdminPod(adminServerPodName, "7001",
201+
domainNamespace, ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT);
202+
} catch (IOException ex) {
203+
logger.severe(ex.getMessage());
204+
}
201205
}
206+
// shutdown domain and verify the domain is shutdown
207+
shutdownDomainAndVerify(domainNamespace, domainUid, replicaCount);
202208
}
203-
// shutdown domain and verify the domain is shutdown
204-
shutdownDomainAndVerify(domainNamespace, domainUid, replicaCount);
205209
}
206210

207211
/**

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_APP_DEPLOYMENT_NAME;
4949
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
5050
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
51+
import static oracle.weblogic.kubernetes.TestConstants.OCNE;
5152
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
5253
import static oracle.weblogic.kubernetes.TestConstants.SSL_PROPERTIES;
5354
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
@@ -358,9 +359,9 @@ void testMiiDynamicChangeWithSSLEnabled() {
358359
+ MANAGED_SERVER_NAME_BASE + "1"
359360
+ "/applicationRuntimes/" + MII_BASIC_APP_DEPLOYMENT_NAME
360361
+ "/workManagerRuntimes/newWM";
361-
if (OKE_CLUSTER) {
362+
if (OKE_CLUSTER || OCNE) {
362363
ExecResult result = exeAppInServerPod(domainNamespace, managedServerPrefix + "1",9002, resourcePath);
363-
logger.info("result in OKE_CLUSTER is {0}", result.toString());
364+
logger.info("result in OKE_CLUSTER or OCNE cluster is {0}", result.toString());
364365
assertEquals(0, result.exitValue(), "Failed to access WebLogic rest endpoint");
365366
} else {
366367
testUntil(

0 commit comments

Comments
 (0)