From 183e164e5f8be362ade3dfbd2e35425100a4e091 Mon Sep 17 00:00:00 2001
From: mancini <mancini@astron.nl>
Date: Wed, 27 Nov 2019 10:59:03 +0100
Subject: [PATCH] Add test for DP3.Execute

Former-commit-id: 7a6488abdb6f2b62039550d40b977b8342187f73
---
 .gitlab-ci.yml             |  7 +++++++
 steps/DP3.Execute.cwl      |  2 +-
 test_jobs/dp3_execute.json | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 test_jobs/dp3_execute.json

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aac584ff..f84d4dea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,6 +30,7 @@ build_docker:
     
 push_docker_tags:
   image: docker:latest
+  allow_failure: true
   stage: push_docker
   only: 
     - tags
@@ -126,6 +127,12 @@ NDPPP:
   script:
     - cwltool --no-container --preserve-environment LD_LIBRARY_PATH --preserve-environment PATH steps/DPPP.cwl test_jobs/NDPPP.json
 
+DP3.Execute:
+  stage: test_steps
+  allow_failure: true
+  script:
+    - cwltool --no-container --preserve-enviroment LD_LIBRARY_PATH --preserve-enviroment PATH steps/DP3.Execute.cwl test_jobs/dp3_execute.json
+
 h5parm_collector:
   stage: test_steps
   allow_failure: true
diff --git a/steps/DP3.Execute.cwl b/steps/DP3.Execute.cwl
index 22e80de4..bf15ea45 100644
--- a/steps/DP3.Execute.cwl
+++ b/steps/DP3.Execute.cwl
@@ -10,7 +10,7 @@ inputs:
     'sbg:x': -425.39886474609375
     'sbg:y': 127
   - id: msin
-    type: Directory?
+    type: Directory
     'sbg:x': -254.39886474609375
     'sbg:y': 242
   - id: steps
diff --git a/test_jobs/dp3_execute.json b/test_jobs/dp3_execute.json
new file mode 100644
index 00000000..f21dff5b
--- /dev/null
+++ b/test_jobs/dp3_execute.json
@@ -0,0 +1,19 @@
+{ 
+  "msin": {"class": "Directory", "path":"/data/L570745_SB003_uv_first10.MS"},
+  "steps": [
+        {
+            "step_type": "averager",
+            "step_id": "average",
+            "parameters": {
+                "timestep": 1,
+                "freqstep": 1,
+                "minpoints": 0,
+                "minperc": 0,
+                "timeresolution": 0,
+                "freqresolution": 0
+            },
+            "output_files": {}
+        }
+    ],
+  "msout_name": "TEST" 
+}
-- 
GitLab