ci: Split building and waiting for base image into its own command

This should help reduce the overall time associated with the test step
and avoid reaching the 120mins cutoff time for a given command.
This commit is contained in:
Jean-Christophe Fillion-Robin 2016-11-24 15:07:24 -05:00
parent 1e4de86ca6
commit 6018cc6241
No known key found for this signature in database
GPG Key ID: 15C1A2812F958BD3
2 changed files with 7 additions and 1 deletions

View File

@ -14,7 +14,7 @@ env:
- IMAGE=windows-x86 - IMAGE=windows-x86
command: command:
- | - |
if [[ $STEP == "test" ]]; then if [[ $STEP == "dependencies" ]]; then
if [[ $CIRCLE_NODE_INDEX == 0 ]]; then if [[ $CIRCLE_NODE_INDEX == 0 ]]; then
if [[ ! -f ~/BASE_AVAILABLE ]]; then if [[ ! -f ~/BASE_AVAILABLE ]]; then
if [[ -e ~/docker/base.tar ]]; then time docker load -i ~/docker/base.tar; fi if [[ -e ~/docker/base.tar ]]; then time docker load -i ~/docker/base.tar; fi
@ -42,6 +42,8 @@ command:
echo "Base image already downloaded" echo "Base image already downloaded"
fi fi
fi fi
fi
if [[ $STEP == "test" ]]; then
if [[ -e ~/docker/$IMAGE.tar ]]; then time docker load -i ~/docker/$IMAGE.tar; fi if [[ -e ~/docker/$IMAGE.tar ]]; then time docker load -i ~/docker/$IMAGE.tar; fi
time docker pull dockcross/$IMAGE time docker pull dockcross/$IMAGE
time docker load -i ~/docker/base.tar time docker load -i ~/docker/base.tar

View File

@ -17,6 +17,10 @@ dependencies:
test: test:
override: override:
- circleci-matrix:
parallel: true
environment:
STEP: dependencies
- circleci-matrix: - circleci-matrix:
parallel: true parallel: true
timeout: 3000 timeout: 3000