From 783f553b86d852472cddac3741e27fe2a144b96a Mon Sep 17 00:00:00 2001
From: David Rafferty <drafferty@hs.uni-hamburg.de>
Date: Fri, 13 Aug 2021 10:59:26 +0200
Subject: [PATCH] Combine tests and edit path
Former-commit-id: 29729ee78fe207d8f2493586400113509ca631ab
---
.gitlab-ci.yml | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55352615..3eb19d1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,8 +10,7 @@ variables:
stages:
- download_data
- validate_cwl_scripts
- - test_calibrator
- - test_target
+ - test_full
before_script:
- mkdir workdir
@@ -38,19 +37,13 @@ validate_scripts:
script:
- for file in `find . -name 'steps/*.cwl'`; do cwltool --validate $file; done
-run_hba_calibrator:
- stage: test_calibrator
+run_hba_full:
+ stage: test_full
allow_failure: true
needs: ["download_data"]
script:
- cwltool --no-container --preserve-environment LD_LIBRARY_PATH --preserve-environment PATH --preserve-environment PYTHONPATH workflows/HBA_calibrator.cwl test_jobs/HBA_calibrator.json
- - test_jobs/check_workflow_results.py results results_calibrator
+ - test_jobs/check_workflow_results.py results /builds/eosc/prefactor3-cwl/data/results_calibrator
- rm -f results
-
-run_hba_target:
- stage: test_target
- allow_failure: true
- needs: ["download_data"]
- script:
- cwltool --no-container --preserve-environment LD_LIBRARY_PATH --preserve-environment PATH --preserve-environment PYTHONPATH workflows/HBA_target.cwl test_jobs/HBA_target.json
- - test_jobs/check_workflow_results.py results results_target
+ - test_jobs/check_workflow_results.py results /builds/eosc/prefactor3-cwl/data/results_target
--
GitLab