File tree Expand file tree Collapse file tree 2 files changed +9
-9
lines changed Expand file tree Collapse file tree 2 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -28,15 +28,15 @@ before_install:
2828
2929script :
3030 - make build show_version
31- - if [ -z "${TEST_WITH_REAL_API}" -o -z "${TRAVIS_SCALEWAY_TOKEN }" ]; then make test; fi
32- - if [ "${TEST_WITH_REAL_API}" -a "${TRAVIS_SCALEWAY_TOKEN }" ]; then make travis_login; fi
33- - if [ "${TEST_WITH_REAL_API}" -a "${TRAVIS_SCALEWAY_TOKEN }" ]; then make travis_cleanup || true; fi
34- - if [ "${TEST_WITH_REAL_API}" -a "${TRAVIS_SCALEWAY_TOKEN }" ]; then make cover; fi
35- - if [ "${TEST_WITH_REAL_API}" -a "${TRAVIS_SCALEWAY_TOKEN }" ]; then make travis_coveralls; fi
36- - if [ "${TEST_WITH_REAL_API}" -a "${TRAVIS_SCALEWAY_TOKEN }" ]; then make travis_cleanup; fi
31+ - if [ -z "${TEST_WITH_REAL_API}" -o -z "${TRAVIS_SCALEWAY_ORGANIZATION }" ]; then make test; fi
32+ - if [ "${TEST_WITH_REAL_API}" -a "${TRAVIS_SCALEWAY_ORGANIZATION }" ]; then make travis_login; fi
33+ - if [ "${TEST_WITH_REAL_API}" -a "${TRAVIS_SCALEWAY_ORGANIZATION }" ]; then make travis_cleanup || true; fi
34+ - if [ "${TEST_WITH_REAL_API}" -a "${TRAVIS_SCALEWAY_ORGANIZATION }" ]; then make cover; fi
35+ - if [ "${TEST_WITH_REAL_API}" -a "${TRAVIS_SCALEWAY_ORGANIZATION }" ]; then make travis_coveralls; fi
36+ - if [ "${TEST_WITH_REAL_API}" -a "${TRAVIS_SCALEWAY_ORGANIZATION }" ]; then make travis_cleanup; fi
3737
3838after_success :
39- - if [ "${TEST_WITH_REAL_API}" -a "${TRAVIS_SCALEWAY_TOKEN }" ]; then make travis_cleanup; fi
39+ - if [ "${TEST_WITH_REAL_API}" -a "${TRAVIS_SCALEWAY_ORGANIZATION }" ]; then make travis_cleanup; fi
4040
4141after_failure :
42- - if [ "${TEST_WITH_REAL_API}" -a "${TRAVIS_SCALEWAY_TOKEN }" ]; then make travis_cleanup; fi
42+ - if [ "${TEST_WITH_REAL_API}" -a "${TRAVIS_SCALEWAY_ORGANIZATION }" ]; then make travis_cleanup; fi
Original file line number Diff line number Diff line change @@ -170,7 +170,7 @@ travis_coveralls:
170170.PHONY : travis_cleanup
171171travis_cleanup :
172172 # FIXME: delete only resources created for this project
173- if [ " $( TRAVIS_SCALEWAY_TOKEN) " -a " $( TRAVIS_SCALEWAY_ORGANIZATION) " ]; then \
173+ @ if [ " $( TRAVIS_SCALEWAY_TOKEN) " -a " $( TRAVIS_SCALEWAY_ORGANIZATION) " ]; then \
174174 ./scw stop -t $(shell ./scw ps -q) || true ; \
175175 ./scw rm $(shell ./scw ps -aq) || true ; \
176176 ./scw rmi $(shell ./scw images -q) || true ; \
You can’t perform that action at this time.
0 commit comments