Skip to content

Commit e8b0989

Browse files
authored
Ensure e2e tests run if optional deps are missing (#4921)
* 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
1 parent 67f005e commit e8b0989

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

deploy/ci/travis/helm-chart-unit-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ echo "============================="
88
echo "Installing Helm"
99
curl https://raw.githubusercontent.com/helm/helm/master/scripts/get > get_helm.sh
1010
chmod 700 get_helm.sh
11-
./get_helm.sh
11+
./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)
1212

1313
echo "Helm Init (Client)"
1414
helm init --client-only

deploy/ci/travis/job-e2e-before_script.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ docker run -d -p 8080:8080 splatform/stratos-uaa
2121

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

0 commit comments

Comments
 (0)