Skip to content

Commit e5be9ac

Browse files
effigieseffigies
committed
CI: Replace test_init with DOCKER_IMAGE, -ux
1 parent d204848 commit e5be9ac

13 files changed

+12
-67
lines changed

‎.circleci/config.yml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ _store_artifacts_kwds: &store_artifacts_kwds
66

77
_test_environment: &test_environment
88
WORKDIR: /home/circleci/work
9+
DOCKER_IMAGE: "nipype/nipype"
910

1011
_generate_dockerfiles: &generate_dockerfiles
1112
name: Generate Dockerfiles
@@ -159,17 +160,17 @@ jobs:
159160
name: Run pytests (py36)
160161
no_output_timeout: 30m
161162
environment: *test_environment
162-
command: bash /home/circleci/nipype/.circleci/test_py3_pytest.sh
163+
command: bash -ux /home/circleci/nipype/.circleci/test_py3_pytest.sh
163164
- run:
164165
name: Run pytests (py27)
165166
no_output_timeout: 30m
166167
environment: *test_environment
167-
command: bash /home/circleci/nipype/.circleci/test_py2_pytest.sh
168+
command: bash -ux /home/circleci/nipype/.circleci/test_py2_pytest.sh
168169
- run:
169170
name: Build docs (py36)
170171
no_output_timeout: 30m
171172
environment: *test_environment
172-
command: bash /home/circleci/nipype/.circleci/test_py3_docs.sh
173+
command: bash -ux /home/circleci/nipype/.circleci/test_py3_docs.sh
173174
- run: *_run_codecov
174175
- store_artifacts: *store_artifacts_kwds
175176

@@ -192,22 +193,22 @@ jobs:
192193
name: Run FSL FEEDS pipeline (py36)
193194
no_output_timeout: 40m
194195
environment: *test_environment
195-
command: bash /home/circleci/nipype/.circleci/test_py3_fmri_fsl_feeds_linear_l1.sh
196+
command: bash -ux /home/circleci/nipype/.circleci/test_py3_fmri_fsl_feeds_linear_l1.sh
196197
- run:
197198
name: Run FSL reuse pipeline (py36)
198199
no_output_timeout: 40m
199200
environment: *test_environment
200-
command: bash /home/circleci/nipype/.circleci/test_py3_fmri_fsl_reuse_linear_l1.sh
201+
command: bash -ux /home/circleci/nipype/.circleci/test_py3_fmri_fsl_reuse_linear_l1.sh
201202
- run:
202203
name: Run SPM test workflow - 3D inputs (py36)
203204
no_output_timeout: 40m
204205
environment: *test_environment
205-
command: bash /home/circleci/nipype/.circleci/test_py3_fmri_spm_linear_3d.sh
206+
command: bash -ux /home/circleci/nipype/.circleci/test_py3_fmri_spm_linear_3d.sh
206207
- run:
207208
name: Run SPM test workflow - 4D inputs (py36)
208209
no_output_timeout: 40m
209210
environment: *test_environment
210-
command: bash /home/circleci/nipype/.circleci/test_py3_fmri_spm_linear_4d.sh
211+
command: bash -ux /home/circleci/nipype/.circleci/test_py3_fmri_spm_linear_4d.sh
211212
- run: *_run_codecov
212213
- store_artifacts: *store_artifacts_kwds
213214

@@ -230,12 +231,12 @@ jobs:
230231
name: Run SPM DARTEL Level 1 pipeline (py36)
231232
no_output_timeout: 1h
232233
environment: *test_environment
233-
command: bash /home/circleci/nipype/.circleci/test_py3_fmri_spm_dartel_multiproc_l1.sh
234+
command: bash -ux /home/circleci/nipype/.circleci/test_py3_fmri_spm_dartel_multiproc_l1.sh
234235
- run:
235236
name: Run SPM DARTEL Level 2 pipeline (py36)
236237
no_output_timeout: 30m
237238
environment: *test_environment
238-
command: bash /home/circleci/nipype/.circleci/test_py3_fmri_spm_dartel_multiproc_l2.sh
239+
command: bash -ux /home/circleci/nipype/.circleci/test_py3_fmri_spm_dartel_multiproc_l2.sh
239240
- run: *_run_codecov
240241
- store_artifacts: *store_artifacts_kwds
241242

@@ -259,12 +260,12 @@ jobs:
259260
name: Run SPM Nested Level 1 pipeline (py36)
260261
no_output_timeout: 1h
261262
environment: *test_environment
262-
command: bash /home/circleci/nipype/.circleci/test_py3_fmri_spm_nested_multiproc_l1.sh
263+
command: bash -ux /home/circleci/nipype/.circleci/test_py3_fmri_spm_nested_multiproc_l1.sh
263264
- run:
264265
name: Run SPM Nested Level 2 pipeline (py27)
265266
no_output_timeout: 30m
266267
environment: *test_environment
267-
command: bash /home/circleci/nipype/.circleci/test_py2_fmri_spm_nested_multiproc_l2.sh
268+
command: bash -ux /home/circleci/nipype/.circleci/test_py2_fmri_spm_nested_multiproc_l2.sh
268269
- run: *_run_codecov
269270
- store_artifacts: *store_artifacts_kwds
270271
- run:

‎.circleci/test_init.sh‎

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

‎.circleci/test_py2_fmri_spm_nested_multiproc_l2.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
#!/bin/bash
22

3-
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4-
5-
. $DIR/test_init.sh
6-
73
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work -e NIPYPE_NUMBER_OF_CPUS=4 -e NIPYPE_RESOURCE_MONITOR=1 "${DOCKER_IMAGE}:py27" /usr/bin/run_examples.sh fmri_spm_nested MultiProc /data/examples/ l2pipeline

‎.circleci/test_py2_pytest.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
#!/bin/bash
22

3-
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4-
5-
. $DIR/test_init.sh
6-
73
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

‎.circleci/test_py3_docs.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
#!/bin/bash
22

3-
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4-
5-
. $DIR/test_init.sh
6-
73
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

‎.circleci/test_py3_fmri_fsl_feeds_linear_l1.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
#!/bin/bash
22

3-
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4-
5-
. $DIR/test_init.sh
6-
73
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work "${DOCKER_IMAGE}:py36" /usr/bin/run_examples.sh fmri_fsl_feeds Linear /data/examples/ l1pipeline

‎.circleci/test_py3_fmri_fsl_reuse_linear_l1.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
#!/bin/bash
22

3-
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4-
5-
. $DIR/test_init.sh
6-
73
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work "${DOCKER_IMAGE}:py36" /usr/bin/run_examples.sh fmri_fsl_reuse Linear /data/examples/ level1_workflow

‎.circleci/test_py3_fmri_spm_dartel_multiproc_l1.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
#!/bin/bash
22

3-
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4-
5-
. $DIR/test_init.sh
6-
73
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work "${DOCKER_IMAGE}:py36" /usr/bin/run_examples.sh fmri_spm_dartel MultiProc /data/examples/ level1

‎.circleci/test_py3_fmri_spm_dartel_multiproc_l2.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
#!/bin/bash
22

3-
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4-
5-
. $DIR/test_init.sh
6-
73
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work "${DOCKER_IMAGE}:py36" /usr/bin/run_examples.sh fmri_spm_dartel MultiProc /data/examples/ l2pipeline

‎.circleci/test_py3_fmri_spm_linear_3d.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
#!/bin/bash
22

3-
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4-
5-
. $DIR/test_init.sh
6-
73
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work "${DOCKER_IMAGE}:py36" /usr/bin/run_examples.sh test_spm Linear /data/examples/ workflow3d

0 commit comments

Comments
 (0)