@@ -1921,6 +1921,7 @@ EOF
1921
1921
# - local --> run locally - requires java & weblogic to be installed
1922
1922
# - remote --> run remotely on admin server, construct URL using admin pod name
1923
1923
# - 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
1925
#
1925
1926
function run_wlst_script {
1926
1927
if [ " $# " -lt 3 ] ; then
@@ -1943,7 +1944,7 @@ function run_wlst_script {
1943
1944
local password=` get_wladmin_pass $1 `
1944
1945
local pyfile_lcl=" $3 "
1945
1946
local pyfile_pod=" /shared/` basename $pyfile_lcl ` "
1946
- local t3url_lcl=" t3://$NODEPORT_HOST :$ADMIN_WLST_PORT "
1947
+ local t3url_lcl=" t3://$K8S_NODEPORT_IP :$ADMIN_WLST_PORT "
1947
1948
local t3url_pod=" t3://$AS_NAME :$ADMIN_WLST_PORT "
1948
1949
local wlcmdscript_lcl=" $TMP_DIR /wlcmd.sh"
1949
1950
local wlcmdscript_pod=" /shared/wlcmd.sh"
@@ -2032,6 +2033,7 @@ EOF
2032
2033
2033
2034
if [ " $result " = " 0" ];
2034
2035
then
2036
+ cat ${pyfile_lcl} .out
2035
2037
break
2036
2038
fi
2037
2039
@@ -2205,9 +2207,10 @@ function verify_service_and_pod_created {
2205
2207
local EXTCHANNEL_T3CHANNEL_SERVICE_NAME=${SERVICE_NAME} -extchannel-t3channel
2206
2208
trace " checking if service ${EXTCHANNEL_T3CHANNEL_SERVICE_NAME} is created"
2207
2209
count=0
2210
+ srv_count=0
2208
2211
while [ " ${srv_count:= Error} " != " 1" -a $count -lt $max_count_srv ] ; do
2209
2212
local count=` expr $count + 1`
2210
- local srv_count=` kubectl -n $NAMESPACE get services | grep " ^$SERVICE_NAME " | wc -l`
2213
+ local srv_count=` kubectl -n $NAMESPACE get services | grep " ^$EXTCHANNEL_T3CHANNEL_SERVICE_NAME " | wc -l`
2211
2214
if [ " ${srv_count:= Error} " != " 1" ]; then
2212
2215
trace " Did not find service $EXTCHANNEL_T3CHANNEL_SERVICE_NAME , iteration $count of $max_count_srv "
2213
2216
sleep $wait_time
@@ -2258,6 +2261,9 @@ function verify_service_and_pod_created {
2258
2261
fi
2259
2262
2260
2263
if [ " ${IS_ADMIN_SERVER} " = " true" ]; then
2264
+ trace " listing pods"
2265
+ kubectl -n $NAMESPACE get pods -o wide
2266
+
2261
2267
verify_wlst_access $DOM_KEY
2262
2268
fi
2263
2269
}
0 commit comments