Fix CI/CD for WLS (#281)

* Fix CI/CD for WLS

* Fix scripts to use WORKSPACE if exists

Author: Tim Middleton

scripts/test-create-cluster.sh

@@ -18,9 +18,13 @@ fi
 
 VERSION=$1
 
-CONFIG_DIR=/tmp/$$.create
+# Use WORKSPACE directory if running under Jenkins
+TEMP_DIR=/tmp
+[ ! -z "$WORKSPACE" ] && TEMP_DIR=$WORKSPACE
+
+CONFIG_DIR=${TEMP_DIR}/$$.create
 DIR=`pwd`
-OUTPUT=/tmp/$$.output
+OUTPUT=${TEMP_DIR}/$$.output
 
 mkdir -p ${CONFIG_DIR}
 trap "rm -rf ${CONFIG_DIR} $OUTPUT" EXIT SIGINT

scripts/test-create-starter.sh

@@ -11,11 +11,14 @@
 
 pwd
 
+# Use WORKSPACE directory if running under Jenkins
+TEMP_DIR=/tmp
+[ ! -z "$WORKSPACE" ] && TEMP_DIR=$WORKSPACE
 
-CONFIG_DIR=/tmp/$$.create.starter
+CONFIG_DIR=${TEMP_DIR}/$$.create.starter
 DIR=`pwd`
-OUTPUT=/tmp/$$.output
-STARTER_DIR=`mktemp -d`
+OUTPUT=${TEMP_DIR}/$$.output
+STARTER_DIR=${TEMP_DIR}/$$.starter
 LOGS_DIR=$DIR/build/_output/test-logs
 
 mkdir -p ${CONFIG_DIR} ${STARTER_DIR} ${LOGS_DIR}

scripts/test-monitor-cluster.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# Copyright (c) 2024 Oracle and/or its affiliates.
+# Copyright (c) 2024, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at
 # https://oss.oracle.com/licenses/upl.
 #
@@ -17,9 +17,13 @@ fi
 
 VERSION=$1
 
-export CONFIG_DIR=/tmp/$$.create
+# Use WORKSPACE directory if running under Jenkins
+TEMP_DIR=/tmp
+[ ! -z "$WORKSPACE" ] && TEMP_DIR=$WORKSPACE
+
+export CONFIG_DIR=${TEMP_DIR}/$$.create
 export DIR=`pwd`
-OUTPUT=/tmp/$$.output
+OUTPUT=${TEMP_DIR}/$$.output
 
 mkdir -p ${CONFIG_DIR}
 trap "rm -rf $CONFIG_DIR $OUTPUT" EXIT SIGINT

scripts/test-weblogic.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+# Copyright (c) 2022, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at
 # https://oss.oracle.com/licenses/upl.
 #
@@ -20,13 +20,17 @@ if [ $# -ne 1 ] ; then
    exit
 fi
 
+# Use WORKSPACE directory if running under Jenkins
+TEMP_DIR=/tmp
+[ ! -z "$WORKSPACE" ] && TEMP_DIR=$WORKSPACE
+
 URL=$1
-CONFIG_DIR=/tmp/$$.weblogic
+CONFIG_DIR=${TEMP_DIR}/$$.weblogic
 DIR=`pwd`
-OUTPUT=/tmp/$$.output
+OUTPUT=${TEMP_DIR}/$$.output
 
 mkdir -p ${CONFIG_DIR}
-trap "rm -rf ${CONFIG_DIR} $OUTPUT" EXIT SIGINT
+trap "cp ${CONFIG_DIR}/cohctl.log /tmp; rm -rf ${CONFIG_DIR} $OUTPUT" EXIT SIGINT
 
 echo
 echo "Using URL:  ${URL}"