Skip to content

Commit 727ad54

Browse files
committed
ENH: Add Relevant BUILDNAME for CDash submission
This commit enables continuous integration testing with docker to submit results on the dashboard with a more relevant build name. This build name corresponds to the docker image tag that was previously set up in PR #49 to specify the build option used by the image. The image tag is extracted from the name of the Docker directory that contains the Dockerfile. This directory must be named according to this convention : Docker-$DOCKER_TAG. To provide a relevant build name to the image, $DOCKER_TAG has to be set as an environment variable in the circle.yml file where it is passed as an argument when running the test.sh script.
1 parent a6318ca commit 727ad54

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

circle.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
machine:
22
services:
33
- docker
4+
environment:
5+
DOCKER_TAG_1: itk-v4.8.0_use_system_libraries-off
46

57
dependencies:
68
override:
79
- docker info
8-
- docker pull slicer/slicerexecutionmodel:itk-v4.8.0_use_system_libraries-off
10+
- docker pull slicer/slicerexecutionmodel:$DOCKER_TAG_1
911

1012
test:
1113
override:
1214
- mkdir ~/SlicerExecutionModel-build
13-
- docker run -v ~/SlicerExecutionModel:/usr/src/SlicerExecutionModel -v ~/SlicerExecutionModel-build:/usr/src/SlicerExecutionModel-build slicer/slicerexecutionmodel:itk-v4.8.0_use_system_libraries-off /usr/src/SlicerExecutionModel/test/Docker/test.sh
15+
- docker run -v ~/SlicerExecutionModel:/usr/src/SlicerExecutionModel -v ~/SlicerExecutionModel-build:/usr/src/SlicerExecutionModel-build slicer/slicerexecutionmodel:$DOCKER_TAG_1 /usr/src/SlicerExecutionModel/test/Docker/test.sh $DOCKER_TAG_1
1416

test/Docker/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ docker run \
1313
--rm \
1414
-v $script_dir/../..:/usr/src/SlicerExecutionModel \
1515
slicer/slicerexecutionmodel:$lower_case_tag \
16-
/usr/src/SlicerExecutionModel/test/Docker/test.sh
16+
/usr/src/SlicerExecutionModel/test/Docker/test.sh $lower_case_tag

test/Docker/test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ cd /usr/src/SlicerExecutionModel-build || die "Could not cd into the build direc
1313
cmake \
1414
-G Ninja \
1515
-DCMAKE_BUILD_TYPE:STRING=Release \
16+
-DBUILDNAME:STRING=$1 \
1617
/usr/src/SlicerExecutionModel || die "CMake configuration failed"
1718
ctest -VV -D Experimental || die "ctest failed"

0 commit comments

Comments
 (0)