Uniting stages

.gitlab-ci.yml

@@ -4,15 +4,8 @@
 # by now we only do build and test, we could add another stage "deploy" if
 # needed
 stages:
-  - build
   - test
 
-cache:
-  key: "$CI_BUILD_REF_NAME"
-  untracked: true
-  paths:
-    - build-ci/
-
 # this is executed before doing anything else
 before_script:
   - echo "Running global 'before_script'..."
@@ -38,12 +31,12 @@ before_script:
   - echo "... done running global 'before_script'."
 
 # BUILD STAGE
-build:centos6.6:
-  stage: build
+test:centos6.6:
+  stage: test
   image: centos:6.6
   script:
-  - echo "Building on CentOS 6..."
-  - rm -fr build-ci/
+  - echo "Testing on CentOS 6..."
+  - echo "    Building OST..."
   - mkdir build-ci
   - cd build-ci
   - cmake .. -DENABLE_MM=1
@@ -70,18 +63,8 @@ build:centos6.6:
              -DTIFF_LIBRARY=$EBROOTLIBTIFF/lib/libtiff.so
              -DOPTIMIZE=1
   - make -j 2
-  - echo "... done building on CentOS 6."
-
-# TESTS STAGE
-test:centos6.6:
-  stage: test
-  image: centos:6.6
-  script:
-  - echo "Testing on CentOS 6..."
-  - pwd
-  - ls .
-  - ls ..
-  - ls -la /cache
-  - cd build-ci/
+  - echo "    ... done building OST."
+  - echo "    Running unit tests for OST..."  
   - make check
+  - echo "    ... done running unit tests for OST..." 
   - echo "... done testing on CentOS 6."