Skip to content
Snippets Groups Projects
Commit 22fcf702 authored by Guillaume Samson's avatar Guillaume Samson :snowman2:
Browse files

Merge branch '625-testcases-artifacts-not-uploaded-from-pipelines' into 'main' 

Resolve "testcases artifacts not uploaded from pipelines + minor fixes"

Closes #625

See merge request !868
parents 7e397288 5bb6cdf0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 20
− 17
View file @ 22fcf702
......@@ -62,10 +62,13 @@ include:
.artifact_run: &artifact_run
paths:
- sette/sette_run_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- sette/sette_run_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
- cfgs/${CONFIG}_ST/*/sette.*.out
- cfgs/${CONFIG}_ST/*/sette.*.err
- cfgs/${CONFIG}_ST/*/ocean.output*
- tests/${CONFIG}_ST/*/sette.*.out
- tests/${CONFIG}_ST/*/sette.*.err
- tests/${CONFIG}_ST/*/ocean.output*
when: always
expire_in: 30 days
......@@ -116,11 +119,11 @@ sette_cmp:
- $NEMO_HPC
script:
- cd sette
- ./sette.sh ${SETTE_OPT} -n ${CONFIG} -x "COMPILE" | tee -a sette_cmp_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- ./sette.sh ${SETTE_OPT} -n ${CONFIG} -x "COMPILE" | tee -a sette_cmp_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
- cd -
artifacts:
paths:
- sette/sette_cmp_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- sette/sette_cmp_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
when: always
expire_in: 30 days
......@@ -146,7 +149,7 @@ sette_run:RESTART:
GIT_STRATEGY: none
script:
- cd sette
- ./sette.sh ${SETTE_OPT} -n ${CONFIG} -x "RESTART" | tee -a sette_run_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- ./sette.sh ${SETTE_OPT} -n ${CONFIG} -x "RESTART" | tee -a sette_run_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
- cd -
artifacts:
<<: *artifact_run
......@@ -173,7 +176,7 @@ sette_run:REPRO:
GIT_STRATEGY: none
script:
- cd sette
- ./sette.sh ${SETTE_OPT} -n ${CONFIG} -x "REPRO" | tee -a sette_run_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- ./sette.sh ${SETTE_OPT} -n ${CONFIG} -x "REPRO" | tee -a sette_run_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
- cd -
artifacts:
<<: *artifact_run
......@@ -200,7 +203,7 @@ sette_run:CORRUPT:
GIT_STRATEGY: none
script:
- cd sette
- ./sette.sh ${SETTE_OPT} -n ${CONFIG} -x "CORRUPT" | tee -a sette_run_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- ./sette.sh ${SETTE_OPT} -n ${CONFIG} -x "CORRUPT" | tee -a sette_run_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
- cd -
artifacts:
<<: *artifact_run
......@@ -227,7 +230,7 @@ sette_run:PHYOPTS:
GIT_STRATEGY: none
script:
- cd sette
- ./sette.sh ${SETTE_OPT} -n ${CONFIG} -x "PHYOPTS" | tee -a sette_run_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- ./sette.sh ${SETTE_OPT} -n ${CONFIG} -x "PHYOPTS" | tee -a sette_run_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
- cd -
artifacts:
<<: *artifact_run
......@@ -251,10 +254,10 @@ sette_rpt:RESTART:
GIT_STRATEGY: none
script:
- cd sette
- ./sette_rpt.sh ${SETTE_OPT/" -w"} -n "${CONFIG}" -x "RESTART" ${SETTERPT_OPT} | tee -a sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- ./sette_rpt.sh ${SETTE_OPT/" -w"} -n "${CONFIG}" -x "RESTART" ${SETTERPT_OPT} | tee -a sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
artifacts:
paths:
- sette/sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- sette/sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
when: always
expire_in: 30 days
......@@ -277,10 +280,10 @@ sette_rpt:REPRO:
GIT_STRATEGY: none
script:
- cd sette
- ./sette_rpt.sh ${SETTE_OPT/" -w"} -n "${CONFIG}" -x "REPRO" ${SETTERPT_OPT} | tee -a sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- ./sette_rpt.sh ${SETTE_OPT/" -w"} -n "${CONFIG}" -x "REPRO" ${SETTERPT_OPT} | tee -a sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
artifacts:
paths:
- sette/sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- sette/sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
when: always
expire_in: 30 days
......@@ -303,10 +306,10 @@ sette_rpt:CORRUPT:
GIT_STRATEGY: none
script:
- cd sette
- ./sette_rpt.sh ${SETTE_OPT/" -w"} -n "${CONFIG}" -x "CORRUPT" ${SETTERPT_OPT} | tee -a sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- ./sette_rpt.sh ${SETTE_OPT/" -w"} -n "${CONFIG}" -x "CORRUPT" ${SETTERPT_OPT} | tee -a sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
artifacts:
paths:
- sette/sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- sette/sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
when: always
expire_in: 30 days
......@@ -329,10 +332,10 @@ sette_rpt:PHYOPTS:
GIT_STRATEGY: none
script:
- cd sette
- ./sette_rpt.sh ${SETTE_OPT/" -w"} -n "${CONFIG}" -x "PHYOPTS" ${SETTERPT_OPT} | tee -a sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- ./sette_rpt.sh ${SETTE_OPT/" -w"} -n "${CONFIG}" -x "PHYOPTS" ${SETTERPT_OPT} | tee -a sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
artifacts:
paths:
- sette/sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- sette/sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
when: always
expire_in: 30 days
......@@ -355,9 +358,9 @@ sette_rpt:COMPARE:
GIT_STRATEGY: none
script:
- cd sette
- ./sette_rpt.sh ${SETTE_OPT/" -w"} -n "${CONFIG}" -x "COMPARE" ${NEMO_REFSHA:+-S ${NEMO_REFSHA}} ${SETTERPT_OPT} | tee -a sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- ./sette_rpt.sh ${SETTE_OPT/" -w"} -n "${CONFIG}" -x "COMPARE" ${NEMO_REFSHA:+-S ${NEMO_REFSHA}} ${SETTERPT_OPT} | tee -a sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
artifacts:
paths:
- sette/sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${HPC}.log
- sette/sette_rpt_${CONFIG}_${CI_COMMIT_SHORT_SHA}_${NEMO_HPC}.log
when: always
expire_in: 30 days
.gitlab-ci/.TEST-REPRO.yml
+ 1
− 1
View file @ 22fcf702
variables:
#PATTERN: $PATTERN_REPRO
PATTERN: '/ORCA2_ICE_PISCES|ORCA2_OFF_PISCES|AMM12|AGRIF_DEMO|WED025|GYRE_PISCES|GYRE_GO|ORCA2_SAS_ICE|ORCA2_ICE_OBS|SWG|ICE_AGRIF|OVERFLOW|LOCK_EXCHANGE|VORTEX|ISOMIP+|IWAVE/'
\ No newline at end of file
PATTERN: '/ORCA2_ICE_PISCES|ORCA2_OFF_PISCES|AMM12|AGRIF_DEMO|WED025|GYRE_PISCES|GYRE_GO|ORCA2_SAS_ICE|ORCA2_ICE_OBS|SWG|ICE_AGRIF|VORTEX|ISOMIP+/'
\ No newline at end of file
.gitlab-ci/.TEST-VAR.yml
+ 2
− 2
View file @ 22fcf702
......@@ -3,7 +3,7 @@
variables:
PATTERN_RESTART: '/ORCA2_ICE_PISCES|ORCA2_OFF_PISCES|AMM12|AGRIF_DEMO|WED025|GYRE_PISCES|GYRE_GO|ORCA2_SAS_ICE|ORCA2_ICE_OBS|C1D_PAPA|SWG|ICE_AGRIF|OVERFLOW|LOCK_EXCHANGE|VORTEX|ISOMIP+|IWAVE/'
PATTERN_REPRO: '/ORCA2_ICE_PISCES|ORCA2_OFF_PISCES|AMM12|AGRIF_DEMO|WED025|GYRE_PISCES|GYRE_GO|ORCA2_SAS_ICE|ORCA2_ICE_OBS|SWG|ICE_AGRIF|OVERFLOW|LOCK_EXCHANGE|VORTEX|ISOMIP+|IWAVE/'
PATTERN_REPRO: '/ORCA2_ICE_PISCES|ORCA2_OFF_PISCES|AMM12|AGRIF_DEMO|WED025|GYRE_PISCES|GYRE_GO|ORCA2_SAS_ICE|ORCA2_ICE_OBS|SWG|ICE_AGRIF|VORTEX|ISOMIP+/'
PATTERN_CORRUPT: '/AGRIF_DEMO/'
PATTERN_PHYOPTS: '/OVERFLOW|LOCK_EXCHANGE/'
......@@ -18,7 +18,7 @@ variables:
.repro:
variables:
CONFIG: [ORCA2_ICE_PISCES,ORCA2_OFF_PISCES,AMM12,AGRIF_DEMO,WED025,GYRE_PISCES,GYRE_GO,ORCA2_SAS_ICE,ORCA2_ICE_OBS,SWG,ICE_AGRIF,OVERFLOW,LOCK_EXCHANGE,VORTEX,ISOMIP+,IWAVE]
CONFIG: [ORCA2_ICE_PISCES,ORCA2_OFF_PISCES,AMM12,AGRIF_DEMO,WED025,GYRE_PISCES,GYRE_GO,ORCA2_SAS_ICE,ORCA2_ICE_OBS,SWG,ICE_AGRIF,VORTEX,ISOMIP+]
.corrupt:
variables:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment