Skip to content

Commit

Permalink
Update presubmit e2e to use pod local ip (istio#551)
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

Update presubmit e2e to use pod local ip

Quick fix to unblock every one. I'll create another fix to actually use the service like kuat mentionned.

```release-note
NONE
```

Former-commit-id: b301529
  • Loading branch information
sebastienvas authored and istio-merge-robot committed Aug 9, 2017
1 parent 8eb2d8a commit 2626808
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 8 deletions.
42 changes: 42 additions & 0 deletions prow/e2e.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#!/bin/bash

# Copyright 2017 Istio Authors

# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

# http://www.apache.org/licenses/LICENSE-2.0

# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.


#######################################
# Presubmit script triggered by Prow. #
#######################################

# Exit immediately for non zero status
set -e
# Check unset variables
set -u
# Print commands
set -x

# Running out of external ips
E2E_ARGS=(--use_local_cluster)

if [ "${CI}" == 'bootstrap' ]; then
# bootsrap upload all artifacts in _artifacts to the log bucket.
ARTIFACTS_DIR="${GOPATH}/src/istio.io/istio/_artifacts"
LOG_HOST="stackdriver"
PROJ_ID="istio-testing"
E2E_ARGS+=(--test_logs_path="${ARTIFACTS_DIR}" --log_provider=${LOG_HOST} --project_id=${PROJ_ID})
# Use the provided pull head sha, from prow.
fi

echo 'Running Integration Tests'
./tests/e2e.sh ${E2E_ARGS[@]} ${@}
9 changes: 1 addition & 8 deletions prow/istio-presubmit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,12 @@ set -u
# Print commands
set -x

E2E_ARGS=()

if [ "${CI}" == 'bootstrap' ]; then
# Test harness will checkout code to directory $GOPATH/src/github.com/istio/istio
# but we depend on being at path $GOPATH/src/istio.io/istio for imports
ln -sf ${GOPATH}/src/github.com/istio ${GOPATH}/src/istio.io
cd ${GOPATH}/src/istio.io/istio

# bootsrap upload all artifacts in _artifacts to the log bucket.
ARTIFACTS_DIR="${GOPATH}/src/istio.io/istio/_artifacts"
LOG_HOST="stackdriver"
PROJ_ID="istio-testing"
E2E_ARGS+=(--test_logs_path="${ARTIFACTS_DIR}" --log_provider=${LOG_HOST} --project_id=${PROJ_ID})
# Use the provided pull head sha, from prow.
GIT_SHA="${PULL_PULL_SHA}"
else
Expand All @@ -56,4 +49,4 @@ echo 'Pushing Images'
(cd devel/fortio && make authorize all TAG="${GIT_SHA}")

echo 'Running Integration Tests'
./tests/e2e.sh ${E2E_ARGS[@]}
./prow/e2e.sh

0 comments on commit 2626808

Please sign in to comment.