Skip to content

Commit 0e0c618

Browse files
committed
use nodeport IP instead of hostname for T3Channel connect test. Fix check for T3channel service.
1 parent b1ba8bc commit 0e0c618

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/integration-tests/bash/run.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1921,6 +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)
19241925
#
19251926
function run_wlst_script {
19261927
if [ "$#" -lt 3 ] ; then
@@ -1943,7 +1944,7 @@ function run_wlst_script {
19431944
local password=`get_wladmin_pass $1`
19441945
local pyfile_lcl="$3"
19451946
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"
19471948
local t3url_pod="t3://$AS_NAME:$ADMIN_WLST_PORT"
19481949
local wlcmdscript_lcl="$TMP_DIR/wlcmd.sh"
19491950
local wlcmdscript_pod="/shared/wlcmd.sh"
@@ -2032,6 +2033,7 @@ EOF
20322033

20332034
if [ "$result" = "0" ];
20342035
then
2036+
cat ${pyfile_lcl}.out
20352037
break
20362038
fi
20372039

@@ -2205,9 +2207,10 @@ function verify_service_and_pod_created {
22052207
local EXTCHANNEL_T3CHANNEL_SERVICE_NAME=${SERVICE_NAME}-extchannel-t3channel
22062208
trace "checking if service ${EXTCHANNEL_T3CHANNEL_SERVICE_NAME} is created"
22072209
count=0
2210+
srv_count=0
22082211
while [ "${srv_count:=Error}" != "1" -a $count -lt $max_count_srv ] ; do
22092212
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`
22112214
if [ "${srv_count:=Error}" != "1" ]; then
22122215
trace "Did not find service $EXTCHANNEL_T3CHANNEL_SERVICE_NAME, iteration $count of $max_count_srv"
22132216
sleep $wait_time
@@ -2258,6 +2261,9 @@ function verify_service_and_pod_created {
22582261
fi
22592262

22602263
if [ "${IS_ADMIN_SERVER}" = "true" ]; then
2264+
trace "listing pods"
2265+
kubectl -n $NAMESPACE get pods -o wide
2266+
22612267
verify_wlst_access $DOM_KEY
22622268
fi
22632269
}

wercker.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ integration-test:
108108
109109
# Update KUBECONFIG for K8S cluster
110110
export K8S_NODEPORT_HOST="${OCI_K8S_WORKER0_HOSTNAME}"
111+
export K8S_NODEPORT_IP="${OCI_K8S_WORKER0_IP}"
111112
sed -i -e "s,%ADDRESS%,https://$OCI_K8S_MASTER_IP:443,g" $WERCKER_SOURCE_DIR/build/kube.config
112113
sed -i -e "s,%CLIENT_CERT_DATA%,$OCI_K8S_CLIENT_CERT_DATA,g" $WERCKER_SOURCE_DIR/build/kube.config
113114
sed -i -e "s,%CLIENT_KEY_DATA%,$OCI_K8S_CLIENT_KEY_DATA,g" $WERCKER_SOURCE_DIR/build/kube.config

0 commit comments

Comments
 (0)