From 75829d9874e6e62d1204b6adab520bd6d9073b14 Mon Sep 17 00:00:00 2001
From: Giovanni La Mura <giovanni.lamura@inaf.it>
Date: Fri, 12 Jan 2024 17:53:05 +0100
Subject: [PATCH] Update pipeline configuration
---
.gitlab-ci.yml | 85 ++++++++++++++++++++++++++++----------------------
1 file changed, 48 insertions(+), 37 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6101d18..f65a992e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
# CI pipeline configuration
default:
- image: gcc
+ image: gmulas/np-tmcode
# Switch from branch pipelines to merge request pipelines when a merge request is created
workflow:
@@ -24,40 +24,46 @@ stages:
building_stage:
stage: build
+ tags: ["np-tmcode"]
allow_failure: false
- #artifacts:
- # paths:
- # - build/cluster/*
- # - build/sphere/*
- # - build/trapping/*
- # exclude:
- # - ".git*"
- # - ".git/**/*"
- # expire_in: 2 hours
+ artifacts:
+ paths:
+ - build/cluster/*
+ - build/sphere/*
+ #- build/trapping/*
+ exclude:
+ - ".git*"
+ - ".git/**/*"
+ expire_in: 2 hours
script:
# bash commands to be executed
- pwd
- hostname
- echo $CI_COMMIT_SHA
- echo $CI_COMMIT_BRANCH
+ - echo "Getting system info ..."
+ - cat /etc/os-release
- cd src
- - echo "Running make (ONLY C++ CODE)"
- #- make conly
+ - echo "Running make ..."
+ - make
running_stage:
stage: run
+ tags: ["np-tmcode"]
allow_failure: false
needs:
- job: building_stage
- #artifacts:
- # paths:
- # - build/cluster/*
- # - build/sphere/*
- # - build/trapping/*
- # exclude:
- # - ".git*"
- # - ".git/**/*"
- # expire_in: 2 hours
+ dependencies:
+ - building_stage
+ artifacts:
+ paths:
+ - build/cluster/c_*
+ - build/sphere/c_*
+ #- build/trapping/*
+ exclude:
+ - ".git*"
+ - ".git/**/*"
+ expire_in: 2 hours
script:
# bash commands to be executed
- pwd
@@ -66,26 +72,31 @@ running_stage:
- echo $CI_COMMIT_BRANCH
- cd build/sphere
- echo "Running np_sphere"
- #- chmod +x np_sphere
- #- ./np_sphere
+ - chmod +x np_sphere
+ - ./np_sphere
- cd ../cluster
- echo "Running np_cluster"
- #- chmod +x np_cluster
- #- ./np_cluster
+ - chmod +x np_cluster
+ - ./np_cluster
testing_stage:
stage: test
+ tags: ["np-tmcode"]
allow_failure: true
needs:
+ - job: building_stage
- job: running_stage
- #artifacts:
- # paths:
- # - build/cluster/pycompare.html
- # - build/sphere/pycompare.html
- # exclude:
- # - ".git*"
- # - ".git/**/*"
- # expire_in: 2 hours
+ dependencies:
+ - building_stage
+ - running_stage
+ artifacts:
+ paths:
+ - build/cluster/pycompare.html
+ - build/sphere/pycompare.html
+ exclude:
+ - ".git*"
+ - ".git/**/*"
+ expire_in: 2 hours
script:
# bash commands to be executed
- pwd
@@ -93,11 +104,11 @@ testing_stage:
- echo $CI_COMMIT_SHA
- echo $CI_COMMIT_BRANCH
- cd build/sphere
- #- cp ../../test_data/sphere/OSPH .
+ - export FFILE=../../test_data/sphere/OSPH
- echo "Comparing output of SPHERE"
- #- python3 ../../src/scripts/pycompare.py --ffile=OSPH --cfile=c_OSPH --html
+ - python3 ../../src/scripts/pycompare.py --ffile=$FFILE --cfile=c_OSPH --html
- cd ../cluster
- echo "Comparing output of CLUSTER"
- #- cp ../../test_data/cluster/OCLU .
- #- python3 ../../src/scripts/pycompare.py --ffile=OCLU --cfile=c_OCLU --html
+ - export FFILE=../../test_data/cluster/OCLU
+ - python3 ../../src/scripts/pycompare.py --ffile=$FFILE --cfile=c_OCLU --html
--
GitLab