OWLS-99654 - Expand the WDT custom folder from the archive in the domain dir before calling update or create domain. (#3110)

Author: ankedia

operator/src/main/resources/scripts/modelInImage.sh

@@ -894,6 +894,8 @@ function wdtCreatePrimordialDomain() {
 
   trace "About to call '${WDT_BINDIR}/createDomain.sh ${wdtArgs}'."
 
+  expandWdtArchiveCustomDir
+
   if [ -z "${OPSS_FLAGS}" ]; then
 
     # We get here for WLS domains, and for the JRF 'first time' case
@@ -983,6 +985,8 @@ function wdtUpdateModelDomain() {
 
   trace "About to call '${WDT_BINDIR}/updateDomain.sh ${wdtArgs}'."
 
+  expandWdtArchiveCustomDir
+
   ${WDT_BINDIR}/updateDomain.sh ${wdtArgs} > ${WDT_OUTPUT} 2>&1
   ret=$?
 
@@ -1378,3 +1382,14 @@ function wdtRotateAndCopyLogFile() {
 
   cp ${WDT_ROOT}/logs/${logFileName} ${WDT_OUTPUT_DIR}/
 }
+
+# Function to expand the WDT custom folder from the archive before calling update or create domain.
+function expandWdtArchiveCustomDir() {
+  cd ${DOMAIN_HOME} || exitOrLoop
+  for file in $(sort_files ${IMG_ARCHIVES_ROOTDIR} "*.zip")
+    do
+        ${JAVA_HOME}/bin/jar xf ${IMG_ARCHIVES_ROOTDIR}/${file} wlsdeploy/custom
+    done
+
+  traceDirs before ${DOMAIN_HOME}/wlsdeploy/custom
+}

operator/src/main/resources/scripts/utils.sh

@@ -101,6 +101,7 @@ function traceEnv() {
     INTROSPECT_HOME \
     PATH \
     TRACE_TIMING \
+    WLSDEPLOY_PROPERTIES \
     OPERATOR_ENVVAR_NAMES
   do
     echo "    ${env_var}='${!env_var}'"