|
73 | 73 | import static oracle.weblogic.kubernetes.actions.TestActions.deleteConfigMap;
|
74 | 74 | import static oracle.weblogic.kubernetes.actions.TestActions.getDomainCustomResource;
|
75 | 75 | import static oracle.weblogic.kubernetes.actions.TestActions.getJob;
|
76 |
| -import static oracle.weblogic.kubernetes.actions.TestActions.getPod; |
77 | 76 | import static oracle.weblogic.kubernetes.actions.TestActions.getPodCreationTimestamp;
|
78 | 77 | import static oracle.weblogic.kubernetes.actions.TestActions.getPodLog;
|
79 | 78 | import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
|
|
97 | 96 | import static oracle.weblogic.kubernetes.utils.ImageUtils.imageRepoLoginAndPushImageToRegistry;
|
98 | 97 | import static oracle.weblogic.kubernetes.utils.IstioUtils.createIstioDomainResource;
|
99 | 98 | import static oracle.weblogic.kubernetes.utils.JobUtils.createJobAndWaitUntilComplete;
|
100 |
| -import static oracle.weblogic.kubernetes.utils.JobUtils.getIntrospectJobName; |
101 | 99 | import static oracle.weblogic.kubernetes.utils.PatchDomainUtils.patchDomainWithNewSecretAndVerify;
|
102 | 100 | import static oracle.weblogic.kubernetes.utils.PersistentVolumeUtils.createfixPVCOwnerContainer;
|
103 | 101 | import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodDoesNotExist;
|
104 | 102 | import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodReady;
|
105 | 103 | import static oracle.weblogic.kubernetes.utils.PodUtils.getExternalServicePodName;
|
| 104 | +import static oracle.weblogic.kubernetes.utils.PodUtils.getIntrospectorPodName; |
106 | 105 | import static oracle.weblogic.kubernetes.utils.PodUtils.getPodCreationTime;
|
107 | 106 | import static oracle.weblogic.kubernetes.utils.PodUtils.setPodAntiAffinity;
|
108 | 107 | import static oracle.weblogic.kubernetes.utils.SecretUtils.createSecretWithUsernamePassword;
|
@@ -1239,20 +1238,15 @@ public static void verifyIntrospectorRuns(String domainUid, String domainNamespa
|
1239 | 1238 | //verify the introspector pod is created and runs
|
1240 | 1239 | LoggingFacade logger = getLogger();
|
1241 | 1240 | 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 | + |
1252 | 1244 | logger.info("Introspector pod log START");
|
| 1245 | + String introspectorLog = assertDoesNotThrow(() -> getPodLog(introspectorPodName, |
| 1246 | + domainNamespace, null, null, null, true), "Could not get introspector pod log"); |
1253 | 1247 | logger.info(introspectorLog);
|
1254 | 1248 | logger.info("Introspector pod log END");
|
1255 |
| - checkPodDoesNotExist(introspectJobName, domainUid, domainNamespace); |
| 1249 | + checkPodDoesNotExist(introspectorPodName, domainUid, domainNamespace); |
1256 | 1250 | }
|
1257 | 1251 |
|
1258 | 1252 | /**
|
|
0 commit comments