This repository was archived by the owner on Sep 12, 2024. It is now read-only.
File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1212 environment :
1313 CIRCLE_ARTIFACTS : /tmp/circleci-artifacts
1414 CIRCLE_TEST_REPORTS : /tmp/circleci-test-results
15+ CIRCLE_MACHINE_EXECUTOR : true
1516 MAVEN_OPTS : -Xmx128m
1617 JAVA_VERSION : *jdk_180_version
1718
@@ -66,14 +67,20 @@ jobs:
6667 docker :
6768 - image : spotify/helios-test-container:1
6869 working_directory : ~/spotify/helios
69- parallelism : 1
70+ parallelism : 6
7071 shell : /bin/bash --login
7172 environment :
73+ CIRCLE_ARTIFACTS : /tmp/circleci-artifacts
74+ CIRCLE_TEST_REPORTS : /tmp/circleci-test-results
7275 MAVEN_OPTS : -Xmx128m
7376
7477 steps :
7578 - checkout
7679
80+ - setup_remote_docker
81+
82+ - run : mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
83+
7784 - run : ./circle.sh pre_machine
7885
7986 - run :
8390 # Without this increased timeout, downloading deps often times out.
8491 no_output_timeout : 20m
8592
86- - run : ./circle.sh verify_no_tests
93+ - run :
94+ command : ./circle.sh test
95+ no_output_timeout : 20m
96+
97+ - run : if [ "$CIRCLE_NODE_INDEX" == "0" ]; then ./circle.sh post_test; fi
98+
99+ - run : ./circle.sh collect_test_reports
100+
101+ - store_test_results :
102+ path : /tmp/circleci-test-results
103+
104+ # Save artifacts
105+ - store_artifacts :
106+ path : /tmp/circleci-artifacts
107+ - store_artifacts :
108+ path : artifacts
109+ - store_artifacts :
110+ path : /var/log/upstart/docker.log
111+ - store_artifacts :
112+ path : /tmp/circleci-test-results
87113
88114workflows :
89115 version : 2
Original file line number Diff line number Diff line change @@ -33,10 +33,12 @@ case "$1" in
3333 ;;
3434
3535 test)
36- # fix DOCKER_HOST to be accessible from within containers
37- docker0_ip=$( /sbin/ifconfig docker0 | grep ' inet addr' | \
38- awk -F: ' {print $2}' | awk ' {print $1}' )
39- export DOCKER_HOST=" tcp://$docker0_ip :2375"
36+ if [ -n " $CIRCLE_MACHINE_EXECUTOR " ]; then
37+ # fix DOCKER_HOST to be accessible from within containers
38+ docker0_ip=$( /sbin/ifconfig docker0 | grep ' inet addr' | \
39+ awk -F: ' {print $2}' | awk ' {print $1}' )
40+ export DOCKER_HOST=" tcp://$docker0_ip :2375"
41+ fi
4042
4143 case $CIRCLE_NODE_INDEX in
4244 0)
You can’t perform that action at this time.
0 commit comments