message: update gitlab config to use new module-based Docker images
diff: @@ -16,6 +16,15 @@ variables:
  script:
  - scripts/build_gitlab/linux.sh # default script
  +.job_template: &build_job_docker_modules
  + stage: build
  + tags:
  + - docker
  + - modules
  + image: ospray/docker-images:centos6-mod
  + script:
  + - scripts/build_gitlab/linux.sh
  +
  .job_template: &build_job_shell
  stage: build
  tags:
  @@ -33,8 +42,12 @@ variables:
  - master
  - /^release-.*$/
  -.job_template: &test_job_shell
  +.job_template: &test_job
  stage: test-build
  + tags:
  + - docker
  + script:
  + - scripts/tests/run_tests.sh
  artifacts:
  paths:
  - $CI_PROJECT_DIR/build/tests.xml
  @@ -42,13 +55,6 @@ variables:
  expire_in: 1 week
  when: always
  -.job_template: &test_job
  - <<: *test_job_shell
  - script:
  - - scripts/tests/run_tests.sh
  - tags:
  - - docker
  -
  .job_template: &test_job_windows
  <<: *test_job
  script:
  @@ -104,50 +110,45 @@ build-ubuntu1404-gcc:
  expire_in: 3 day
  build-centos6-gcc:
  - <<: *build_job_shell
  + <<: *build_job_docker_modules
  script:
  - module load cmake
  - module load gcc/4.8.2
  - module load embree
  - module load tbb
  + - module load ispc
  - export CC=gcc
  - export CXX=g++
  - scripts/build_gitlab/linux.sh
  artifacts:
  paths:
  - $CI_PROJECT_DIR
  - tags:
  - - centos6
  build-centos6-icc:
  - <<: *build_job_shell
  + <<: *build_job_docker_modules
  script:
  - module load cmake
  - module load gcc/4.8.2
  - module load intel
  - module load embree
  - module load tbb
  + - module load ispc
  - export CC=icc
  - export CXX=icpc
  - scripts/build_gitlab/linux.sh
  - tags:
  - - centos6
  - - icc
  build-centos6-icc15:
  - <<: *build_job_shell
  + <<: *build_job_docker_modules
  script:
  - module load cmake
  - module load gcc/4.8.2
  - module load intel/2015
  - module load embree
  - module load tbb
  + - module load ispc
  - export CC=icc
  - export CXX=icpc
  - scripts/build_gitlab/linux.sh
  - tags:
  - - centos6
  - - icc
  build-centos7-gcc:
  <<: *build_job_docker
  @@ -251,19 +252,15 @@ test-centos7-gcc:
  - build-centos7-gcc
  test-centos6-gcc:
  - <<: *test_job_shell
  + <<: *test_job
  + image: ospray/docker-images:centos6-mod
  + dependencies:
  + - build-centos6-gcc
  script:
  - - module load cmake
  - - module load gcc/4.8.2
  - - module load embree
  - module load tbb
  - - export CC=gcc
  - - export CXX=g++
  - scripts/tests/run_tests.sh
  - dependencies:
  - - build-centos6-gcc
  tags:
  - - centos6
  + - modules
  test-ubuntu1404-gcc:
  <<: *test_job
  