Skip to content

Commit 4d1e726

Browse files
committed
undo temp changes
1 parent 4434d92 commit 4d1e726

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

src/integration-tests/bash/run.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2901,13 +2901,6 @@ function test_suite {
29012901

29022902
# entry point
29032903

2904-
if [ "$JENKINS" = "true" ]; then
2905-
echo "git branch `git branch`"
2906-
echo "BRANCH_NAME ${BRANCH_NAME}"
2907-
mvn test-compile integration-test -P java-integration-tests
2908-
exit "$?"
2909-
fi
2910-
29112904
if [ "$WERCKER" = "true" -o "$JENKINS" = "true" ]; then
29122905
if [ "${VERBOSE:-false}" = "true" ]; then
29132906
test_suite 2>&1

wercker.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ integration-test:
111111
cp /etc/hosts $WERCKER_PIPELINE_DIR/hosts
112112
sed -i "$ a ${OCI_K8S_WORKER0_IP} ${OCI_K8S_WORKER0_HOSTNAME}" $WERCKER_PIPELINE_DIR/hosts
113113
cp $WERCKER_PIPELINE_DIR/hosts /etc/hosts
114-
115-
echo "OCI_K8S_WORKER0_IP =$OCI_K8S_WORKER0_IP"
116114
117115
# Update KUBECONFIG for K8S cluster
118116
export K8S_NODEPORT_HOST="${OCI_K8S_WORKER0_HOSTNAME}"
@@ -216,7 +214,7 @@ integration-test-java:
216214
sed -i -e "s,%CLIENT_CERT_DATA%,$OCI_K8S_CLIENT_CERT_DATA,g" $WERCKER_SOURCE_DIR/build/kube.config
217215
sed -i -e "s,%CLIENT_KEY_DATA%,$OCI_K8S_CLIENT_KEY_DATA,g" $WERCKER_SOURCE_DIR/build/kube.config
218216
export KUBECONFIG="$WERCKER_SOURCE_DIR/build/kube.config"
219-
217+
220218
# running on Wercker
221219
export WERCKER="true"
222220

0 commit comments

Comments
 (0)