Skip to content

Commit da44dac

Browse files
committed
ensure that jenkins still use hostname for t3channcel test
1 parent 0e0c618 commit da44dac

File tree

1 file changed

+7
-2
lines changed
  • src/integration-tests/bash

1 file changed

+7
-2
lines changed

src/integration-tests/bash/run.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1921,7 +1921,7 @@ EOF
19211921
# - local --> run locally - requires java & weblogic to be installed
19221922
# - remote --> run remotely on admin server, construct URL using admin pod name
19231923
# - hybrid --> run remotely on admin server, construct URL using 'NODEPORT_HOST'
1924-
# (using K8S_NODEPORT_IP instead since NODEPORT_HOST sometimes does not work in OCI)
1924+
# or 'K8S_NODEPORT_IP' in wercker since NODEPORT_HOST sometimes does not work in OCI
19251925
#
19261926
function run_wlst_script {
19271927
if [ "$#" -lt 3 ] ; then
@@ -1944,7 +1944,12 @@ function run_wlst_script {
19441944
local password=`get_wladmin_pass $1`
19451945
local pyfile_lcl="$3"
19461946
local pyfile_pod="/shared/`basename $pyfile_lcl`"
1947-
local t3url_lcl="t3://$K8S_NODEPORT_IP:$ADMIN_WLST_PORT"
1947+
if [ "$WERCKER" = "true" ]; then
1948+
# use OCI public IP in wercker
1949+
local t3url_lcl="t3://$K8S_NODEPORT_IP:$ADMIN_WLST_PORT"
1950+
else
1951+
local t3url_lcl="t3://$NODEPORT_HOST:$ADMIN_WLST_PORT"
1952+
fi
19481953
local t3url_pod="t3://$AS_NAME:$ADMIN_WLST_PORT"
19491954
local wlcmdscript_lcl="$TMP_DIR/wlcmd.sh"
19501955
local wlcmdscript_pod="/shared/wlcmd.sh"

0 commit comments

Comments
 (0)