From 5a824d8ef74bcaaa97066063422c6ac2baa70792 Mon Sep 17 00:00:00 2001
From: Andre Offringa <offringa@astron.nl>
Date: Wed, 1 Dec 2021 14:46:44 +0000
Subject: [PATCH] CI fixes
Former-commit-id: eccca39c8651aea0c21c898b539d8f83071f3e10
---
.gitlab-ci.yml | 11 +++--------
test_jobs/HBA_target.json | 2 +-
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d942088..d333fed4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,39 +46,34 @@ validate_scripts:
blsmooth:
stage: test_steps
- allow_failure: true
needs: ["download_data"]
script:
- cwltool --no-container steps/blsmooth.cwl test_jobs/blsmooth.json
find_skymodel_cal:
stage: test_steps
- allow_failure: true
needs: ["download_data"]
script:
- cwltool --no-container --preserve-environment PYTHONPATH steps/find_skymodel_cal.cwl test_jobs/find_skymodel_cal.json
check_ateam_separation:
stage: test_steps
- allow_failure: true
needs: ["download_data"]
script:
- - cwltool --no-container --preserve-environment LD_LIBRARY_PATH --preserve-environment PATH --preserve-environment PYTHONPATH steps/check_ateam_separation.cwl test_jobs/check_ateam_separation.json
+ - cwltool --no-container --preserve-environment PATH --preserve-environment PYTHONPATH steps/check_ateam_separation.cwl test_jobs/check_ateam_separation.json
run_hba_calibrator:
stage: test_full
- allow_failure: true
needs: ["download_data"]
script:
- - cwltool --no-container --preserve-environment LD_LIBRARY_PATH --preserve-environment PATH --preserve-environment PYTHONPATH --outdir results workflows/HBA_calibrator.cwl test_jobs/HBA_calibrator.json
+ - cwltool --no-container --preserve-environment PATH --preserve-environment PYTHONPATH --outdir results workflows/HBA_calibrator.cwl test_jobs/HBA_calibrator.json
- test_jobs/check_workflow_results.py results /builds/eosc/prefactor3-cwl/data/results_calibrator
run_hba_target:
stage: test_full
- allow_failure: true
needs: ["download_data"]
script:
- - cwltool --no-container --preserve-environment LD_LIBRARY_PATH --preserve-environment PATH --preserve-environment PYTHONPATH --outdir results workflows/HBA_target.cwl test_jobs/HBA_target.json
+ - cwltool --no-container --preserve-environment PATH --preserve-environment PYTHONPATH --outdir results workflows/HBA_target.cwl test_jobs/HBA_target.json
- test_jobs/check_workflow_results.py results /builds/eosc/prefactor3-cwl/data/results_target
build-doc:
diff --git a/test_jobs/HBA_target.json b/test_jobs/HBA_target.json
index 24fdcf26..f6f5b024 100644
--- a/test_jobs/HBA_target.json
+++ b/test_jobs/HBA_target.json
@@ -85,7 +85,7 @@
"ncores": 12,
"cal_solutions": {
"class": "File",
- "path": "/builds/eosc/prefactor3-cwl/data/results_calibrator/cal_solutions.h5"
+ "path": "../data/results_calibrator/cal_solutions.h5"
},
"A-Team_skymodel": {
"class": "File",
--
GitLab