Fixing the JRF domain creation issue

Author: maggiehe00

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

@@ -93,7 +93,8 @@ public static void staticUnPrepare() throws Exception {
    */
   @Test
   public void testJrfDomainOnPvUsingWlst() throws Exception {
-    String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
+  	Assume.assumeTrue(QUICKTEST);
+  	String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
     logger.info("Creating Operator & waiting for the script to complete execution");
     // create operator1

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

@@ -1534,7 +1534,11 @@ protected void initialize(Map<String, Object> inputDomainMap) throws Exception {
     if (domainMap.containsKey("domainHomeImageBase")) {
       sampleDomainInputsFile =
           "/samples/scripts/create-weblogic-domain/domain-home-in-image/create-domain-inputs.yaml";
+    } else if (domainMap.containsKey("rcuDatabaseURL")) {
+    	sampleDomainInputsFile =
+          "/samples/scripts/create-fmw-infrastructure-domain/domain-home-on-pv/create-domain-inputs.yaml";
     }
+    logger.info("For this domain sampleDomainInputsFile is: " + sampleDomainInputsFile);
     Yaml dyaml = new Yaml();
     InputStream sampleDomainInputStream =
         new FileInputStream(new File(BaseTest.getResultDir() + sampleDomainInputsFile));

kubernetes/samples/scripts/common/utility.sh

@@ -349,9 +349,9 @@ function createFiles {
       defaultImageName="`basename ${domainHomeImageBuildPath} | sed 's/^[0-9]*-//'`"
       baseTag=${domainHomeImageBase#*:}
       defaultImageName=${defaultImageName}:${baseTag:-"latest"}
-      sed -i -e "s:%IMAGE_NAME%|${defaultImageName}:g" ${domainPropertiesOutput}
+      sed -i -e "s:%IMAGE_NAME%:${defaultImageName}:g" ${domainPropertiesOutput}
     else 
-      sed -i -e "s:%IMAGE_NAME%|${image}:g" ${domainPropertiesOutput}
+      sed -i -e "s:%IMAGE_NAME%:${image}:g" ${domainPropertiesOutput}
     fi
   else
 
@@ -406,7 +406,7 @@ function createFiles {
     # extra entries for FMW Infra domains
     sed -i -e "s:%RCU_CREDENTIALS_SECRET_NAME%:${rcuCredentialsSecret}:g" ${createJobOutput}
     sed -i -e "s:%CUSTOM_RCUPREFIX%:${rcuSchemaPrefix}:g" ${createJobOutput}
-    sed -i -e "s:%CUSTOM_CONNECTION_STRING%:${rcuDatabaseURL}:g" ${createJobOutput}
+    sed -i -e "s|%CUSTOM_CONNECTION_STRING%|${rcuDatabaseURL}|g" ${createJobOutput}
     sed -i -e "s:%EXPOSE_T3_CHANNEL_PREFIX%:${exposeAdminT3Channel}:g" ${createJobOutput}
     # entries for Istio
     sed -i -e "s:%ISTIO_PREFIX%:${istioPrefix}:g" ${createJobOutput}
@@ -482,9 +482,9 @@ function createFiles {
 
     # now we know which image to use, update the domain yaml file
     if [ -z $image ]; then
-      sed -i -e "s:%WEBLOGIC_IMAGE%|${defaultImageName}:g" ${dcrOutput}
+      sed -i -e "s:%WEBLOGIC_IMAGE%:${defaultImageName}:g" ${dcrOutput}
     else
-      sed -i -e "s:%WEBLOGIC_IMAGE%|${image}:g" ${dcrOutput}
+      sed -i -e "s:%WEBLOGIC_IMAGE%:${image}:g" ${dcrOutput}
     fi
   else
     sed -i -e "s:%WEBLOGIC_IMAGE%:${image}:g" ${dcrOutput}