Skip to content

Commit 655fa42

Browse files
effigieseffigies
committed
CI: Split tests in config, for timing steps
1 parent 0a99a4a commit 655fa42

File tree

5 files changed

+91
-31
lines changed

5 files changed

+91
-31
lines changed

‎.circleci/config.yml

Lines changed: 61 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,21 @@ jobs:
120120
export DATA_NIPYPE_FSL_FEEDS="${OSF_NIPYPE_URL}/57f473066c613b01f113e7af"
121121
curl -sSL --retry 5 --connect-timeout 15 "$DATA_NIPYPE_FSL_FEEDS" | tar xz
122122
- run:
123-
name: Run tests
124-
no_output_timeout: 2h
123+
name: Prepare working directory
125124
environment:
126125
WORKDIR: /home/circleci/work
127126
command: |
128127
mkdir -p "$WORKDIR"
129128
chmod -R 777 "$WORKDIR"
130-
bash /home/circleci/nipype/.circleci/pytests.sh
129+
- run:
130+
name: Run pytests (py36)
131+
command: bash /home/circleci/nipype/.circleci/test_py3_pytest.sh
132+
- run:
133+
name: Run pytests (py27)
134+
command: bash /home/circleci/nipype/.circleci/test_py2_pytest.sh
135+
- run:
136+
name: Build docs (py36)
137+
command: bash /home/circleci/nipype/.circleci/test_py3_docs.sh
131138
- store_artifacts:
132139
path: /home/circleci/work/tests
133140

@@ -201,17 +208,36 @@ jobs:
201208
export DATA_NIPYPE_FSL_FEEDS="${OSF_NIPYPE_URL}/57f473066c613b01f113e7af"
202209
curl -sSL --retry 5 --connect-timeout 15 "$DATA_NIPYPE_FSL_FEEDS" | tar xz
203210
- run:
204-
name: Run tests
205-
no_output_timeout: 2h
211+
name: Prepare working directory
206212
environment:
207213
WORKDIR: /home/circleci/work
208214
command: |
209215
mkdir -p "$WORKDIR"
210216
chmod -R 777 "$WORKDIR"
211-
bash /home/circleci/nipype/.circleci/test_py3_fmri_fsl_feeds_linear_l1.sh
212-
bash /home/circleci/nipype/.circleci/test_py3_fmri_fsl_reuse_linear_l1.sh
213-
bash /home/circleci/nipype/.circleci/test_py3_fmri_spm_linear_3d.sh
214-
bash /home/circleci/nipype/.circleci/test_py3_fmri_spm_linear_4d.sh
217+
- run:
218+
name: Run FSL FEEDS pipeline (py36)
219+
no_output_timeout: 40m
220+
environment:
221+
WORKDIR: /home/circleci/work
222+
command: bash /home/circleci/nipype/.circleci/test_py3_fmri_fsl_feeds_linear_l1.sh
223+
- run:
224+
name: Run FSL reuse pipeline (py36)
225+
no_output_timeout: 40m
226+
environment:
227+
WORKDIR: /home/circleci/work
228+
command: bash /home/circleci/nipype/.circleci/test_py3_fmri_fsl_reuse_linear_l1.sh
229+
- run:
230+
name: Run SPM test workflow - 3D inputs (py36)
231+
no_output_timeout: 40m
232+
environment:
233+
WORKDIR: /home/circleci/work
234+
command: bash /home/circleci/nipype/.circleci/test_py3_fmri_spm_linear_3d.sh
235+
- run:
236+
name: Run SPM test workflow - 4D inputs (py36)
237+
no_output_timeout: 40m
238+
environment:
239+
WORKDIR: /home/circleci/work
240+
command: bash /home/circleci/nipype/.circleci/test_py3_fmri_spm_linear_4d.sh
215241
- store_artifacts:
216242
path: /home/circleci/work/tests
217243

@@ -285,15 +311,24 @@ jobs:
285311
export DATA_NIPYPE_FSL_FEEDS="${OSF_NIPYPE_URL}/57f473066c613b01f113e7af"
286312
curl -sSL --retry 5 --connect-timeout 15 "$DATA_NIPYPE_FSL_FEEDS" | tar xz
287313
- run:
288-
name: Run tests
289-
no_output_timeout: 2h
314+
name: Prepare working directory
290315
environment:
291316
WORKDIR: /home/circleci/work
292317
command: |
293318
mkdir -p "$WORKDIR"
294319
chmod -R 777 "$WORKDIR"
295-
bash /home/circleci/nipype/.circleci/test_py3_fmri_spm_dartel_multiproc_l1.sh
296-
bash /home/circleci/nipype/.circleci/test_py3_fmri_spm_dartel_multiproc_l2.sh
320+
- run:
321+
name: Run SPM DARTEL Level 1 pipeline (py36)
322+
no_output_timeout: 1h
323+
environment:
324+
WORKDIR: /home/circleci/work
325+
command: bash /home/circleci/nipype/.circleci/test_py3_fmri_spm_dartel_multiproc_l1.sh
326+
- run:
327+
name: Run SPM DARTEL Level 2 pipeline (py36)
328+
no_output_timeout: 30m
329+
environment:
330+
WORKDIR: /home/circleci/work
331+
command: bash /home/circleci/nipype/.circleci/test_py3_fmri_spm_dartel_multiproc_l2.sh
297332
- store_artifacts:
298333
path: /home/circleci/work/tests
299334

@@ -382,15 +417,24 @@ jobs:
382417
export DATA_NIPYPE_FSL_FEEDS="${OSF_NIPYPE_URL}/57f473066c613b01f113e7af"
383418
curl -sSL --retry 5 --connect-timeout 15 "$DATA_NIPYPE_FSL_FEEDS" | tar xz
384419
- run:
385-
name: Run tests
386-
no_output_timeout: 2h
420+
name: Prepare working directory
387421
environment:
388422
WORKDIR: /home/circleci/work
389423
command: |
390424
mkdir -p "$WORKDIR"
391425
chmod -R 777 "$WORKDIR"
392-
bash /home/circleci/nipype/.circleci/test_py3_fmri_spm_nested_multiproc_l1.sh
393-
bash /home/circleci/nipype/.circleci/test_py2_fmri_spm_nested_multiproc_l2.sh
426+
- run:
427+
name: Run SPM Nested Level 1 pipeline (py36)
428+
no_output_timeout: 1h
429+
environment:
430+
WORKDIR: /home/circleci/work
431+
command: bash /home/circleci/nipype/.circleci/test_py3_fmri_spm_nested_multiproc_l1.sh
432+
- run:
433+
name: Run SPM Nested Level 2 pipeline (py27)
434+
no_output_timeout: 30m
435+
environment:
436+
WORKDIR: /home/circleci/work
437+
command: bash /home/circleci/nipype/.circleci/test_py2_fmri_spm_nested_multiproc_l2.sh
394438
- store_artifacts:
395439
path: /home/circleci/work/tests
396440
- run:

‎.circleci/pytests.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎.circleci/test_py2_pytest.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
3+
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4+
5+
. $DIR/test_init.sh
6+
7+
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work -e CI_SKIP_TEST=1 -e NIPYPE_RESOURCE_MONITOR=1 -e FSL_COURSE_DATA="/data/examples/nipype-fsl_course_data" "${DOCKER_IMAGE}:py27" /usr/bin/run_pytests.sh
8+
exitcode=$?
9+
10+
. $DIR/test_complete.sh

‎.circleci/test_py3_docs.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
3+
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4+
5+
. $DIR/test_init.sh
6+
7+
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /src/nipype/doc "${DOCKER_IMAGE}:py36" /usr/bin/run_builddocs.sh
8+
exitcode=$?
9+
10+
. $DIR/test_complete.sh

‎.circleci/test_py3_pytest.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
3+
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4+
5+
. $DIR/test_init.sh
6+
7+
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work -e CI_SKIP_TEST=1 -e NIPYPE_RESOURCE_MONITOR=1 -e FSL_COURSE_DATA="/data/examples/nipype-fsl_course_data" "${DOCKER_IMAGE}:py36" /usr/bin/run_pytests.sh
8+
exitcode=$?
9+
10+
. $DIR/test_complete.sh

0 commit comments

Comments
 (0)