Combine tests and edit path

Former-commit-id: 29729ee7

.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