Refactor CI/CD

.gitlab-ci.yml

@@ -21,25 +21,37 @@ docker-base:
     - docker build --pull -t "$CI_REGISTRY_IMAGE:latest" .
     - docker push "$CI_REGISTRY_IMAGE:latest"
 
+.build_das6:
+  before_script:
+    - module load spack/12.2.0
+    - module load cmake
+    - module load boost
+    - module load casacore
+    - cmake -B build . -DCMAKE_BUILD_TYPE=Release
+    - make -C build -j
+
+.build_docker:
+  image: "$CI_REGISTRY_IMAGE:latest"
+  before_script:
+    - cmake -B build . -DCMAKE_BUILD_TYPE=Release
+    - make -C build -j
+    - build/microbenchmarks --benchmark_out=results-generic.json --benchmark_out_format=json
+
 
 build-job:       # This job runs in the build stage, which runs first.
   stage: build
   image: "$CI_REGISTRY_IMAGE:latest"
   script:
     - cmake -B build . -DCMAKE_BUILD_TYPE=Release
-    - make -C build
+    - make -C build -j
     - build/microbenchmarks --benchmark_out=results-generic.json --benchmark_out_format=json
 
 unittests: 
   stage: test
   image: "$CI_REGISTRY_IMAGE:latest"
-  script:
-    - cmake -B build . -DCMAKE_BUILD_TYPE=Release
-    - make -C build
-    - build/microbenchmarks --benchmark_out=results-generic.json --benchmark_out_format=json
   script:
     - cmake -B build .
-    - make -C build
+    - make -C build -j
     - build/unittests
 
 collect-performance:   # This job runs in the test stage.
@@ -48,18 +60,13 @@ collect-performance:   # This job runs in the test stage.
   stage: benchmark    # It only starts when the job in the build stage completes successfully.
   dependencies:
     - build-job
-  before_script:
-    - module load spack/12.2.0
-    - module load cmake
-    - module load boost
-    - module load casacore
+  extends:
+  - build_das6
   script:
-    - cmake -B build . -DCMAKE_BUILD_TYPE=Release
-    - make -C build
     - build/microbenchmarks --benchmark_out=results.json --benchmark_out_format=json
   artifacts:
     paths:
-      - ./results.json
+      - ./results*.json
     untracked: false
     when: on_success
     access: all
@@ -68,13 +75,13 @@ collect-performance:   # This job runs in the test stage.
 collect-performance-generic:
   stage: benchmark
   image: "$CI_REGISTRY_IMAGE:latest"
+  extends:
+  - build_docker
   script:
-    - cmake -B build . -DCMAKE_BUILD_TYPE=Release
-    - make -C build
     - build/microbenchmarks --benchmark_out=results-generic.json --benchmark_out_format=json
   artifacts:
     paths:
-      - ./results.json
+      - ./results*.json
     untracked: false
     when: on_success
     access: all