circleci: Rename image "ctk-test:opengl" into "ctk-test:opengl-qt4"

CMake/CircleCI/CircleCI_CTK_Docker.cmake

@@ -21,6 +21,9 @@
 #
 ##############################################################################
 
+if( NOT "${CTK_QT_VERSION}" MATCHES "4" )
+  message( FATAL_ERROR "CTK_QT_VERSION should be set to 4" )
+endif()
 
 set( CTK_SOURCE_DIR "/usr/src/CTK" )
 set( CTK_BINARY_DIR "/usr/src/CTK-build" )
@@ -46,7 +49,7 @@ set( SITE_PLATFORM "Ubuntu-64" )
 set( SITE_BUILD_TYPE "$ENV{SITE_BUILD_TYPE}" )
 if( NOT( (SITE_BUILD_TYPE MATCHES "Debug") OR (SITE_BUILD_TYPE MATCHES "Release") ) )
   set( SITE_BUILD_TYPE "Debug" ) # Release, Debug
-endif( NOT( (SITE_BUILD_TYPE MATCHES "Debug") OR (SITE_BUILD_TYPE MATCHES "Release") ) )
+endif()
 
 # Named SITE_BUILD_NAME
 string( SUBSTRING $ENV{CIRCLE_SHA1} 0 7 commit )

CMake/CircleCI/Dockerfile

@@ -5,4 +5,4 @@ RUN apt-get update && apt-get install -y \
   qt4-dev-tools \
   cmake
 
-ENV APP "sudo chown -R user.user /usr/src/ && /usr/src/CTK/CMake/CircleCI/test.sh"
+ENV APP "sudo chown -R user.user /usr/src/ && /usr/src/CTK/CMake/CircleCI/test.sh -DCTK_QT_VERSION:STRING=4"

CMake/CircleCI/build.sh

@@ -2,4 +2,4 @@
 
 script_dir="`cd $(dirname $0); pwd`"
 
-docker build -t commontk/ctk-test:opengl $script_dir
+docker build -t commontk/ctk-test:opengl-qt4 $script_dir -f Dockerfile-qt4

CMake/CircleCI/push.sh

@@ -5,4 +5,4 @@ die() {
   exit 1;
 }
 
-docker push commontk/ctk-test:opengl
+docker push commontk/ctk-test:opengl-qt4

CMake/CircleCI/run.sh

@@ -2,4 +2,4 @@
 
 script_dir="`cd $(dirname $0); pwd`"
 
-$script_dir/run_opengl.sh -i commontk/ctk-test:opengl -p 6081 -r --env="CIRCLE_SHA1=$1" -r --env="CIRCLE_BRANCH=$2" -r --env="SITE_BUILD_TYPE=$3"
+$script_dir/run_opengl.sh -i commontk/ctk-test:opengl-$1 -p 6081 -r --env="CIRCLE_SHA1=$2" -r --env="CIRCLE_BRANCH=$3" -r --env="SITE_BUILD_TYPE=$4"

CMake/CircleCI/test.sh

@@ -15,5 +15,6 @@ mkdir /usr/src/CTK-build/CTK-build
 cd /usr/src/CTK-build/CTK-build || die "Could not cd into the build directory"
 
 ctest \
+  $1 \
   -S /usr/src/CTK/CMake/CircleCI/CircleCI_CTK_Docker.cmake \
   -VV || die "ctest failed"

circle.yml

@@ -5,8 +5,8 @@ machine:
 dependencies:
   override:
     - docker info
-    - docker pull commontk/ctk-test:opengl
+    - docker pull commontk/ctk-test:opengl-qt4
 
 test:
   override:
-    - ~/CTK/CMake/CircleCI/run.sh $CIRCLE_SHA1 $CIRCLE_BRANCH $SITE_BUILD_TYPE
+    - ~/CTK/CMake/CircleCI/run.sh qt4 $CIRCLE_SHA1 $CIRCLE_BRANCH $SITE_BUILD_TYPE