From bae9076e26b5e25fe0bed8884b88eb5a5199d525 Mon Sep 17 00:00:00 2001
From: David Rafferty <drafferty@hs.uni-hamburg.de>
Date: Tue, 17 Aug 2021 12:47:02 +0200
Subject: [PATCH] Add steps from master and disable target test
Former-commit-id: 770463341cc4dc5df6490bb46357f8299f596fb9 [formerly 4bd8aea5cbf76ad3141e7e49bbee285899b88a7b]
Former-commit-id: 4b482cc39216c941f185942d947bfe54503462d2
Former-commit-id: 20e326a4c42e4b066dcceac7d5fb697c5a01d187
---
.gitlab-ci.yml | 28 ++++++++++++++++++++++++---
test_jobs/blsmooth.json | 2 +-
test_jobs/check_ateam_separation.json | 2 +-
test_jobs/find_skymodel_cal.json | 2 +-
4 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d450057..684485fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ variables:
stages:
- download_data
- validate_cwl_scripts
+ - test_steps
- test_full
before_script:
@@ -37,6 +38,27 @@ validate_scripts:
script:
- for file in `find . -name 'steps/*.cwl'`; do cwltool --validate $file; done
+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
+
run_hba_full:
stage: test_full
allow_failure: true
@@ -44,6 +66,6 @@ run_hba_full:
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 /builds/eosc/prefactor3-cwl/data/results_calibrator
- - rm -rf results
- - 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 /builds/eosc/prefactor3-cwl/data/results_target
+# - rm -rf results
+# - 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 /builds/eosc/prefactor3-cwl/data/results_target
diff --git a/test_jobs/blsmooth.json b/test_jobs/blsmooth.json
index d2c4b351..ce6a51f5 100644
--- a/test_jobs/blsmooth.json
+++ b/test_jobs/blsmooth.json
@@ -1,7 +1,7 @@
{
"msin": {
"class": "Directory",
- "path": "../data/L570745_SB003_uv_first10.MS"
+ "path": "../data/L667520_SB000_uv.MS"
},
"do_smooth": false
}
diff --git a/test_jobs/check_ateam_separation.json b/test_jobs/check_ateam_separation.json
index 37f4990c..4c12b319 100644
--- a/test_jobs/check_ateam_separation.json
+++ b/test_jobs/check_ateam_separation.json
@@ -1,6 +1,6 @@
{
"ms": {
"class": "Directory",
- "path": "../data/L570745_SB001_uv_first10.MS"
+ "path": "../data/L667520_SB000_uv.MS"
}
}
diff --git a/test_jobs/find_skymodel_cal.json b/test_jobs/find_skymodel_cal.json
index b22f5079..d565e10e 100644
--- a/test_jobs/find_skymodel_cal.json
+++ b/test_jobs/find_skymodel_cal.json
@@ -1,7 +1,7 @@
{
"msin": {
"class": "Directory",
- "path": "../data/L570745_SB000_uv_first10.MS"
+ "path": "../data/L667520_SB000_uv.MS"
},
"skymodels": {
"class": "Directory",
--
GitLab