Skip to content

Commit

Permalink
Ensure e2e tests run if optional deps are missing (cloudfoundry#4921)
Browse files Browse the repository at this point in the history
* Don't fail job-e2e-before_script script if s3 server is missing

* Fix helm v2 cli install
- Peg to lastest v2 build
- Script fails to automatically find it
  - grep of helm release page fails to find 'v2' in first page returned by github
  • Loading branch information
richard-cox authored Apr 16, 2021
1 parent 67f005e commit e8b0989
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion deploy/ci/travis/helm-chart-unit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ echo "============================="
echo "Installing Helm"
curl https://raw.githubusercontent.com/helm/helm/master/scripts/get > get_helm.sh
chmod 700 get_helm.sh
./get_helm.sh
./get_helm.sh -v v2.17.0 # peg to lastest v2 build (script fails to automatically find it - grep of helm release page fails to find v2 in first page)

echo "Helm Init (Client)"
helm init --client-only
Expand Down
3 changes: 2 additions & 1 deletion deploy/ci/travis/job-e2e-before_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ docker run -d -p 8080:8080 splatform/stratos-uaa

# Check that the S3 server is available
if [ -n "${AWS_ENDPOINT}" ]; then
set +e
curl -k --max-time 20 ${AWS_ENDPOINT}
if [ $? -ne 0 ]; then
echo "Can not contact S3 Server"
exit 1
exit 0 # Don't fail whole run if the server is unavailable
fi
fi

0 comments on commit e8b0989

Please sign in to comment.