resolved merge conflicts

Author: vanajamukkara

wercker.yml

@@ -207,21 +207,17 @@ integration-test-java:
     code: |
       #!/bin/bash
       
-      # cp /etc/hosts $WERCKER_PIPELINE_DIR/hosts
-      # sed -i "$ a ${OCI_K8S_WORKER0_IP} ${OCI_K8S_WORKER0_HOSTNAME}" $WERCKER_PIPELINE_DIR/hosts
-      # cp $WERCKER_PIPELINE_DIR/hosts /etc/hosts
-      
+      cp /etc/hosts $WERCKER_PIPELINE_DIR/hosts
+      sed -i "$ a ${OCI_K8S_WORKER0_IP} ${OCI_K8S_WORKER0_HOSTNAME}" $WERCKER_PIPELINE_DIR/hosts
+      cp $WERCKER_PIPELINE_DIR/hosts /etc/hosts
+
       # Update KUBECONFIG for K8S cluster
-      # export K8S_NODEPORT_HOST="${OCI_K8S_WORKER0_HOSTNAME}"
-      export K8S_NODEPORT_HOST="${OCI_K8S_WORKER0_IP}"
+      export K8S_NODEPORT_HOST="${OCI_K8S_WORKER0_HOSTNAME}"
       sed -i -e "s,%ADDRESS%,https://$OCI_K8S_MASTER_IP:443,g" $WERCKER_SOURCE_DIR/build/kube.config
       sed -i -e "s,%CLIENT_CERT_DATA%,$OCI_K8S_CLIENT_CERT_DATA,g" $WERCKER_SOURCE_DIR/build/kube.config
       sed -i -e "s,%CLIENT_KEY_DATA%,$OCI_K8S_CLIENT_KEY_DATA,g" $WERCKER_SOURCE_DIR/build/kube.config
       export KUBECONFIG="$WERCKER_SOURCE_DIR/build/kube.config"
 
-      echo "KUBECONFIG $KUBECONFIG"
-      cat $KUBECONFIG
-      echo "KUBECONFIG END"
       # running on Wercker
       export WERCKER="true"