Skip to content

Commit 19f6da4

Browse files
authored
use introspecotor pod name instead of job name (#3995)
1 parent 5b907b5 commit 19f6da4

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

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

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
import static oracle.weblogic.kubernetes.actions.TestActions.deleteConfigMap;
7474
import static oracle.weblogic.kubernetes.actions.TestActions.getDomainCustomResource;
7575
import static oracle.weblogic.kubernetes.actions.TestActions.getJob;
76-
import static oracle.weblogic.kubernetes.actions.TestActions.getPod;
7776
import static oracle.weblogic.kubernetes.actions.TestActions.getPodCreationTimestamp;
7877
import static oracle.weblogic.kubernetes.actions.TestActions.getPodLog;
7978
import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
@@ -97,12 +96,12 @@
9796
import static oracle.weblogic.kubernetes.utils.ImageUtils.imageRepoLoginAndPushImageToRegistry;
9897
import static oracle.weblogic.kubernetes.utils.IstioUtils.createIstioDomainResource;
9998
import static oracle.weblogic.kubernetes.utils.JobUtils.createJobAndWaitUntilComplete;
100-
import static oracle.weblogic.kubernetes.utils.JobUtils.getIntrospectJobName;
10199
import static oracle.weblogic.kubernetes.utils.PatchDomainUtils.patchDomainWithNewSecretAndVerify;
102100
import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createfixPVCOwnerContainer;
103101
import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodDoesNotExist;
104102
import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodReady;
105103
import static oracle.weblogic.kubernetes.utils.PodUtils.getExternalServicePodName;
104+
import static oracle.weblogic.kubernetes.utils.PodUtils.getIntrospectorPodName;
106105
import static oracle.weblogic.kubernetes.utils.PodUtils.getPodCreationTime;
107106
import static oracle.weblogic.kubernetes.utils.PodUtils.setPodAntiAffinity;
108107
import static oracle.weblogic.kubernetes.utils.SecretUtils.createSecretWithUsernamePassword;
@@ -1239,20 +1238,15 @@ public static void verifyIntrospectorRuns(String domainUid, String domainNamespa
12391238
//verify the introspector pod is created and runs
12401239
LoggingFacade logger = getLogger();
12411240
logger.info("Verifying introspector pod is created, runs and deleted");
1242-
String introspectJobName = getIntrospectJobName(domainUid);
1243-
checkPodReady(introspectJobName, domainUid, domainNamespace);
1244-
1245-
String labelSelector = String.format("weblogic.domainUID in (%s)", domainUid);
1246-
V1Pod introspectorPod = assertDoesNotThrow(() -> getPod(domainNamespace, labelSelector, introspectJobName),
1247-
"Could not get introspector pod");
1248-
assertTrue(introspectorPod != null && introspectorPod.getMetadata() != null,
1249-
"introspector pod or metadata is null");
1250-
String introspectorLog = assertDoesNotThrow(() -> getPodLog(introspectorPod.getMetadata().getName(),
1251-
domainNamespace), "Could not get introspector pod log");
1241+
String introspectorPodName = assertDoesNotThrow(() -> getIntrospectorPodName(domainUid, domainNamespace));
1242+
checkPodReady(introspectorPodName, domainUid, domainNamespace);
1243+
12521244
logger.info("Introspector pod log START");
1245+
String introspectorLog = assertDoesNotThrow(() -> getPodLog(introspectorPodName,
1246+
domainNamespace, null, null, null, true), "Could not get introspector pod log");
12531247
logger.info(introspectorLog);
12541248
logger.info("Introspector pod log END");
1255-
checkPodDoesNotExist(introspectJobName, domainUid, domainNamespace);
1249+
checkPodDoesNotExist(introspectorPodName, domainUid, domainNamespace);
12561250
}
12571251

12581252
/**

0 commit comments

Comments
 (0)