Skip to content

Commit 42041eb

Browse files
committed
Use worker hostname
1 parent 19c4248 commit 42041eb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/integration-tests/bash/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1448,7 +1448,7 @@ EOF
14481448
if [ "$WERCKER" = "true" ]; then
14491449
# hybrid causes script to run on admin pod with a 'NODEPORT_HOST' URL instead of 'pod-name' URL.
14501450
# like local, it uses the t3 channel...
1451-
run_wlst_script $1 remote ${pyfile_con}
1451+
run_wlst_script $1 hybrid ${pyfile_con}
14521452
else
14531453
run_wlst_script $1 local ${pyfile_con}
14541454
fi

wercker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ integration-test: # run in weblogic container so that wlst is available
8585
# /pipeline/weblogic-kubernetes-operator/src/integration-tests/bash/run.sh
8686
8787
cp /etc/hosts /pipeline/hosts
88-
sed -i "$ a ${K8S_17_WORKER_ADDRESS} k8s17worker" /pipeline/hosts
88+
sed -i "$ a ${K8S_17_WORKER_IP} ${K8S_17_WORKER_HOSTNAME}" /pipeline/hosts
8989
cp /pipeline/hosts /etc/hosts
9090
9191
# Update KUBECONFIG for K8S 1.7 cluster
92-
export K8S_NODEPORT_HOST="k8s17worker"
93-
sed -i -e "s,%ADDRESS%,https://$K8S_17_ADDRESS:443,g" /pipeline/source/build/kube.config
92+
export K8S_NODEPORT_HOST="${K8S_17_WORKER_HOSTNAME}"
93+
sed -i -e "s,%ADDRESS%,https://$K8S_17_MASTER_IP:443,g" /pipeline/source/build/kube.config
9494
sed -i -e "s,%CLIENT_CERT_DATA%,$K8S_17_CLIENT_CERT_DATA,g" /pipeline/source/build/kube.config
9595
sed -i -e "s,%CLIENT_KEY_DATA%,$K8S_17_CLIENT_KEY_DATA,g" /pipeline/source/build/kube.config
9696
export KUBECONFIG="/pipeline/source/build/kube.config"

0 commit comments

Comments
 (0)