Ci pipeline (#22617) Signed-off-by: Romain Grecourt <romain.grecourt@oracle.com>
diff --git a/appserver/tests/appserv-tests/devtests/batch/run_test.sh b/appserver/tests/appserv-tests/devtests/batch/run_test.sh index 3ba0e83..825f417 100755 --- a/appserver/tests/appserv-tests/devtests/batch/run_test.sh +++ b/appserver/tests/appserv-tests/devtests/batch/run_test.sh
@@ -20,9 +20,9 @@ } test_run(){ - $S1AS_HOME/bin/asadmin start-domain - $S1AS_HOME/bin/asadmin start-database - cd $APS_HOME/devtests/batch + ${S1AS_HOME}/bin/asadmin start-domain + ${S1AS_HOME}/bin/asadmin start-database + cd ${APS_HOME}/devtests/batch PROXY_HOST=`echo ${http_proxy} | cut -d':' -f2 | ${SED} 's/\/\///g'` PROXY_PORT=`echo ${http_proxy} | cut -d':' -f3 | ${SED} 's/\///g'` ANT_OPTS="${ANT_OPTS} \ @@ -34,49 +34,36 @@ -Dhttps.noProxyHosts='127.0.0.1|localhost|*.oracle.com'" export ANT_OPTS echo "ANT_OPTS=${ANT_OPTS}" - ant $TARGET | tee $TEST_RUN_LOG - $S1AS_HOME/bin/asadmin stop-database - $S1AS_HOME/bin/asadmin stop-domain + ant ${TARGET} | tee ${TEST_RUN_LOG} + ${S1AS_HOME}/bin/asadmin stop-database + ${S1AS_HOME}/bin/asadmin stop-domain } run_test_id(){ - #a common util script located at main/appserver/tests/common_test.sh - source `dirname $0`/../../../common_test.sh - kill_process - delete_gf - download_test_resources glassfish.zip version-info.txt - unzip_test_resources $WORKSPACE/bundles/glassfish.zip - cd `dirname $0` + unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip + cd `dirname ${0}` test_init - get_test_target $1 - #run the actual test function + get_test_target ${1} test_run - generate_junit_report $1 + generate_junit_report ${1} change_junit_report_class_names } -post_test_run(){ - copy_test_artifects - upload_test_results - delete_bundle - cd - -} - get_test_target(){ - case $1 in + case ${1} in batch_all ) TARGET=all export TARGET;; esac - } -OPT=$1 -TEST_ID=$2 -case $OPT in +OPT=${1} +TEST_ID=${2} +source `dirname $0`/../../../common_test.sh +case ${OPT} in list_test_ids ) list_test_ids;; run_test_id ) - trap post_test_run EXIT - run_test_id $TEST_ID ;; + trap "copy_test_artifacts ${TEST_ID}" EXIT + run_test_id ${TEST_ID} ;; esac