Owls76144 - use custom weblogic image in domain home in image tests (#1174)

* adding domainHomeImageBase based on weblogic image name and tag

* fix NPE

* fix NPE

Author: vanajamukkara

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

@@ -226,8 +226,12 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
       if (!domainUidsToBeDeleted.equals("")) {
         logger.info("About to delete domains: " + domainUidsToBeDeleted);
         TestUtils.deleteWeblogicDomainResources(domainUidsToBeDeleted);
-        TestUtils.verifyAfterDeletion(domain1);
-        TestUtils.verifyAfterDeletion(domain2);
+        if(domain1 != null) {
+          TestUtils.verifyAfterDeletion(domain1);
+        }
+        if(domain2 != null) {
+          TestUtils.verifyAfterDeletion(domain2);
+        }
       }
     }
     logger.info("SUCCESS - " + testMethodName);
@@ -308,8 +312,12 @@ public void testTwoDomainsManagedByOneOperatorSharingPV() throws Exception {
       if (!domainUidsToBeDeleted.equals("")) {
         logger.info("About to delete domains: " + domainUidsToBeDeleted);
         TestUtils.deleteWeblogicDomainResources(domainUidsToBeDeleted);
-        TestUtils.verifyAfterDeletion(domain1);
+        if(domain1 != null) {
+          TestUtils.verifyAfterDeletion(domain1);
+        }
+        if(domain2 != null) {
         TestUtils.verifyAfterDeletion(domain2);
+        }
       }
     }
     logger.info("SUCCESS - " + testMethodName);

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

@@ -1569,6 +1569,9 @@ protected void initialize(Map<String, Object> inputDomainMap) throws Exception {
           BaseTest.getResultDir()
               + "/"
               + ((String) domainMap.get("domainHomeImageBuildPath")).trim());
+      
+      domainMap.put("domainHomeImageBase", 
+          BaseTest.getWeblogicImageName()+":"+BaseTest.getWeblogicImageTag());
     }
 
     // remove null values if any attributes