update jrf tests

Author: xiancao

integration-tests/src/test/java/oracle/kubernetes/operator/JrfInOperatorAdvancedTest.java

@@ -159,6 +159,9 @@ public void testJRFDomainClusterRestartVersion() throws Exception {
                 + ", got: "
                 + getMSPodsCount(domain1));
       }
+
+      testCompletedSuccessfully = true;
+
     } finally {
       if (domain1 != null && (JENKINS || testCompletedSuccessfully)) {
         domain1.destroy();
@@ -204,6 +207,8 @@ public void testJRFDomainMSPodCreated() throws Exception {
       domain1 = new JRFDomain(domain1Map);
       domain1.verifyDomainCreated();
 
+      testCompletedSuccessfully = true;
+
     } finally {
       if (domain1 != null && (JENKINS || testCompletedSuccessfully)) {
         domain1.destroy();
@@ -249,6 +254,8 @@ public void testJRFDomainCreateDomainScriptsMountPath() throws Exception {
       domain1 = new JRFDomain(domain1Map);
       domain1.verifyDomainCreated();
 
+      testCompletedSuccessfully = true;
+
     } finally {
       if (domain1 != null && (JENKINS || testCompletedSuccessfully)) {
         domain1.destroy();
@@ -295,6 +302,8 @@ public void testJRFDomainAdminPortEnabled() throws Exception {
       domain1 = new JRFDomain(domain1Map, true);
       domain1.verifyDomainCreated();
 
+      testCompletedSuccessfully = true;
+
     } finally {
       if (domain1 != null && (JENKINS || testCompletedSuccessfully)) {
         domain1.destroy();
@@ -339,6 +348,9 @@ public void testJRFDomainAdminT3Channel() throws Exception {
 
       // verify the Admin T3Channel is exposed
       testAdminT3Channel(domain1);
+
+      testCompletedSuccessfully = true;
+
     } finally {
       if (domain1 != null && (JENKINS || testCompletedSuccessfully)) {
         domain1.destroy();
@@ -400,12 +412,13 @@ private void verifyMSPodsNotReadyCountNotExceedMaxUnAvailable(
    */
   private int getMSPodsNotReadyCount(JRFDomain domain) throws Exception {
 
+    String domainuid = (String) domain.getDomainMap().get("domainUID");
     String managedServerNameBase = (String) domain.getDomainMap().get("managedServerNameBase");
     StringBuffer cmd = new StringBuffer();
     cmd.append("kubectl get pods -n ")
         .append(domain.getDomainNS())
         .append(" | grep ")
-        .append(managedServerNameBase)
+        .append(domainuid + "-" + managedServerNameBase)
         .append(" | grep 0/1 | wc -l");
     ExecResult result = TestUtils.exec(cmd.toString());
 
@@ -421,12 +434,13 @@ private int getMSPodsNotReadyCount(JRFDomain domain) throws Exception {
    */
   private int getMSPodsRunningAndReadyCount(JRFDomain domain) throws Exception {
 
+    String domainuid = (String) domain.getDomainMap().get("domainUID");
     String managedServerNameBase = (String) domain.getDomainMap().get("managedServerNameBase");
     StringBuffer cmd = new StringBuffer();
     cmd.append("kubectl get pods -n ")
         .append(domain.getDomainNS())
         .append(" | grep ")
-        .append(managedServerNameBase)
+        .append(domainuid + "-" + managedServerNameBase)
         .append(" | grep 1/1 | grep Running | wc -l");
     ExecResult result = TestUtils.exec(cmd.toString());
 
@@ -441,12 +455,13 @@ private int getMSPodsRunningAndReadyCount(JRFDomain domain) throws Exception {
    * @throws Exception - if any error occurs
    */
   private int getMSPodsCount(JRFDomain domain) throws Exception {
+    String domainuid = (String) domain.getDomainMap().get("domainUID");
     String managedServerNameBase = (String) domain.getDomainMap().get("managedServerNameBase");
     StringBuffer cmd = new StringBuffer();
     cmd.append("kubectl get pods -n ")
         .append(domain.getDomainNS())
         .append(" | grep ")
-        .append(managedServerNameBase)
+        .append(domainuid + "-" + managedServerNameBase)
         .append(" | wc -l");
     ExecResult result = TestUtils.exec(cmd.toString());