From 3dfd14a2654cec6ec5a67fc10fc37f9c74daac9c Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Wed, 9 Feb 2022 16:52:26 +0100 Subject: [PATCH 01/28] conformance 1.2.1 (adds storage class) --- conformance/ConformanceTestsJob-1.0.yaml | 2 +- conformance/ConformanceTestsJob-1.1.yaml | 8 +-- conformance/ConformanceTestsJob-1.2.1.yaml | 60 ++++++++++++++++++++++ conformance/StageConformanceTestsData.yaml | 40 +++++++++++++-- 4 files changed, 102 insertions(+), 8 deletions(-) create mode 100644 conformance/ConformanceTestsJob-1.2.1.yaml diff --git a/conformance/ConformanceTestsJob-1.0.yaml b/conformance/ConformanceTestsJob-1.0.yaml index e3d9f7a..89605a1 100644 --- a/conformance/ConformanceTestsJob-1.0.yaml +++ b/conformance/ConformanceTestsJob-1.0.yaml @@ -27,7 +27,7 @@ spec: name: conformance-output-data-1-0 containers: - name: tests-1-0 - image: calrissian:conformance + image: docker.terradue.com/calrissian:conformance workingDir: "/conformance/common-workflow-language-1.0.2" command: ["./run_test.sh"] args: diff --git a/conformance/ConformanceTestsJob-1.1.yaml b/conformance/ConformanceTestsJob-1.1.yaml index a011056..91da2a6 100644 --- a/conformance/ConformanceTestsJob-1.1.yaml +++ b/conformance/ConformanceTestsJob-1.1.yaml @@ -5,15 +5,17 @@ metadata: name: conformance-output-data-1-1 spec: accessModes: - - ReadWriteOnce + - ReadWriteMany resources: requests: storage: 1Gi + storageClassName: longhorn + --- apiVersion: batch/v1 kind: Job metadata: - name: conformance-tests-1-1 + name: conformance-tests-1-1b spec: backoffLimit: 0 template: @@ -27,7 +29,7 @@ spec: name: conformance-output-data-1-1 containers: - name: tests-1-1 - image: calrissian:conformance + image: docker.terradue.com/calrissian:conformance workingDir: "/conformance/cwl-v1.1-1.1.0" command: ["./run_test.sh"] args: diff --git a/conformance/ConformanceTestsJob-1.2.1.yaml b/conformance/ConformanceTestsJob-1.2.1.yaml new file mode 100644 index 0000000..fbbe230 --- /dev/null +++ b/conformance/ConformanceTestsJob-1.2.1.yaml @@ -0,0 +1,60 @@ +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: conformance-output-data-1-2-1 +spec: + accessModes: + - ReadWriteMany + resources: + requests: + storage: 1Gi + storageClassName: longhorn + +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: conformance-tests-1-2-1 +spec: + backoffLimit: 0 + template: + spec: + initContainers: + - name: prep-1-2-1 + image: alpine:3.10 + command: ["chmod", "777", "/output"] + volumeMounts: + - mountPath: /output + name: conformance-output-data-1-2-1 + containers: + - name: tests-1-2-1 + image: docker.terradue.com/calrissian:conformance + workingDir: "/conformance/cwl-v1.2-1.2.1_proposed" + command: ["./run_test.sh"] + args: + - "RUNNER=calrissian" + - "--verbose" + - "EXTRA=--max-ram 8G --max-cores 4 --default-container debian:stretch-slim" + env: + - name: CALRISSIAN_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: TMPDIR + value: "/output" + volumeMounts: + - mountPath: /conformance + name: conformance-test-data-1-2-1 + readOnly: true + - mountPath: /output + name: conformance-output-data-1-2-1 + restartPolicy: Never + volumes: + - name: conformance-test-data-1-2-1 + persistentVolumeClaim: + claimName: conformance-test-data-1-2-1 + readOnly: true + - name: conformance-output-data-1-2-1 + persistentVolumeClaim: + claimName: conformance-output-data-1-2-1 diff --git a/conformance/StageConformanceTestsData.yaml b/conformance/StageConformanceTestsData.yaml index ce229ac..1b7656f 100644 --- a/conformance/StageConformanceTestsData.yaml +++ b/conformance/StageConformanceTestsData.yaml @@ -5,11 +5,12 @@ metadata: name: conformance-test-data-1-0 spec: accessModes: - - ReadWriteOnce - - ReadOnlyMany + #- ReadWriteOnce + - ReadWriteMany resources: requests: storage: 1Gi + storageClassName: longhorn --- apiVersion: v1 kind: PersistentVolumeClaim @@ -17,11 +18,25 @@ metadata: name: conformance-test-data-1-1 spec: accessModes: - - ReadWriteOnce - - ReadOnlyMany + #- ReadWriteOnce + - ReadWriteMany resources: requests: storage: 1Gi + storageClassName: longhorn +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: conformance-test-data-1-2-1 +spec: + accessModes: + #- ReadWriteOnce + - ReadWriteMany + resources: + requests: + storage: 1Gi + storageClassName: longhorn --- apiVersion: batch/v1 kind: Job @@ -59,6 +74,20 @@ spec: volumeMounts: - mountPath: /conformance name: conformance-test-data-1-1 + - name: 1-2 + image: alpine:3.10 + command: + - "sh" + - "-c" + - "cd /conformance; wget -q ${CWL_ARCHIVE_BASE}/${CWL_ARCHIVE_FILE}; unzip -q ${CWL_ARCHIVE_FILE}; rm ${CWL_ARCHIVE_FILE}; chmod -R a+rx *; ls -l" + env: + - name: CWL_ARCHIVE_BASE + value: "https://github.com/common-workflow-language/cwl-v1.2/archive/refs/heads" + - name: CWL_ARCHIVE_FILE + value: "1.2.1_proposed.zip" + volumeMounts: + - mountPath: /conformance + name: conformance-test-data-1-2-1 restartPolicy: Never volumes: - name: conformance-test-data-1-0 @@ -67,3 +96,6 @@ spec: - name: conformance-test-data-1-1 persistentVolumeClaim: claimName: conformance-test-data-1-1 + - name: conformance-test-data-1-2-1 + persistentVolumeClaim: + claimName: conformance-test-data-1-2-1 \ No newline at end of file From 557babb6a3313366f7078154325ef114c95a1ad3 Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Wed, 9 Feb 2022 18:47:40 +0100 Subject: [PATCH 02/28] update for conformance againts 1.2.0 --- conformance/ConformanceTestsJob-1.2.yaml | 60 ++++++++++++++++++++++ conformance/StageConformanceTestsData.yaml | 30 +++++++++++ 2 files changed, 90 insertions(+) create mode 100644 conformance/ConformanceTestsJob-1.2.yaml diff --git a/conformance/ConformanceTestsJob-1.2.yaml b/conformance/ConformanceTestsJob-1.2.yaml new file mode 100644 index 0000000..3dfc23f --- /dev/null +++ b/conformance/ConformanceTestsJob-1.2.yaml @@ -0,0 +1,60 @@ +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: conformance-output-data-1-2 +spec: + accessModes: + - ReadWriteMany + resources: + requests: + storage: 1Gi + storageClassName: longhorn + +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: conformance-tests-1-2 +spec: + backoffLimit: 0 + template: + spec: + initContainers: + - name: prep-1-2 + image: alpine:3.10 + command: ["chmod", "777", "/output"] + volumeMounts: + - mountPath: /output + name: conformance-output-data-1-2 + containers: + - name: tests-1-2 + image: docker.terradue.com/calrissian:conformance + workingDir: "/conformance/cwl-v1.2-1.2.0" + command: ["./run_test.sh"] + args: + - "RUNNER=calrissian" + - "--verbose" + - "EXTRA=--max-ram 8G --max-cores 4 --default-container debian:stretch-slim" + env: + - name: CALRISSIAN_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: TMPDIR + value: "/output" + volumeMounts: + - mountPath: /conformance + name: conformance-test-data-1-2 + readOnly: true + - mountPath: /output + name: conformance-output-data-1-2 + restartPolicy: Never + volumes: + - name: conformance-test-data-1-2 + persistentVolumeClaim: + claimName: conformance-test-data-1-2 + readOnly: true + - name: conformance-output-data-1-2 + persistentVolumeClaim: + claimName: conformance-output-data-1-2 diff --git a/conformance/StageConformanceTestsData.yaml b/conformance/StageConformanceTestsData.yaml index 1b7656f..6bdaea4 100644 --- a/conformance/StageConformanceTestsData.yaml +++ b/conformance/StageConformanceTestsData.yaml @@ -27,6 +27,19 @@ spec: --- apiVersion: v1 kind: PersistentVolumeClaim +metadata: + name: conformance-test-data-1-2 +spec: + accessModes: + #- ReadWriteOnce + - ReadWriteMany + resources: + requests: + storage: 1Gi + storageClassName: longhorn +--- +apiVersion: v1 +kind: PersistentVolumeClaim metadata: name: conformance-test-data-1-2-1 spec: @@ -75,6 +88,20 @@ spec: - mountPath: /conformance name: conformance-test-data-1-1 - name: 1-2 + image: alpine:3.10 + command: + - "sh" + - "-c" + - "cd /conformance; wget -q ${CWL_ARCHIVE_BASE}/${CWL_ARCHIVE_FILE}; unzip -q ${CWL_ARCHIVE_FILE}; rm ${CWL_ARCHIVE_FILE}; chmod -R a+rx *; ls -l" + env: + - name: CWL_ARCHIVE_BASE + value: "https://github.com/common-workflow-language/cwl-v1.2/archive/refs/tags" + - name: CWL_ARCHIVE_FILE + value: "v1.2.0.zip" + volumeMounts: + - mountPath: /conformance + name: conformance-test-data-1-2 + - name: 1-2-1 image: alpine:3.10 command: - "sh" @@ -96,6 +123,9 @@ spec: - name: conformance-test-data-1-1 persistentVolumeClaim: claimName: conformance-test-data-1-1 + - name: conformance-test-data-1-2 + persistentVolumeClaim: + claimName: conformance-test-data-1-2 - name: conformance-test-data-1-2-1 persistentVolumeClaim: claimName: conformance-test-data-1-2-1 \ No newline at end of file From 45b869d513e81a524cb86c6e8749c602478abb02 Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Thu, 10 Feb 2022 10:25:55 +0100 Subject: [PATCH 03/28] conformance 1.2.0 --- conformance/ConformanceTestsJob-1.2.yaml | 18 ++++++++--- conformance/README.md | 26 ++++++++++++--- conformance/badges/command_line_tool.json | 1 + conformance/badges/conditional.json | 1 + conformance/badges/docker.json | 1 + conformance/badges/env_var.json | 1 + conformance/badges/expression_tool.json | 1 + conformance/badges/format_checking.json | 1 + conformance/badges/initial_work_dir.json | 1 + conformance/badges/inline_javascript.json | 1 + conformance/badges/inplace_update.json | 1 + .../badges/input_object_requirements.json | 1 + conformance/badges/multiple.json | 1 + conformance/badges/multiple_input.json | 1 + conformance/badges/networkaccess.json | 1 + conformance/badges/required.json | 1 + conformance/badges/resource.json | 1 + conformance/badges/scatter.json | 1 + conformance/badges/schema_def.json | 1 + conformance/badges/secondary_files.json | 1 + conformance/badges/shell_command.json | 1 + conformance/badges/step_input.json | 1 + conformance/badges/step_input_expression.json | 1 + conformance/badges/subworkflow.json | 1 + conformance/badges/timelimit.json | 1 + conformance/badges/workflow.json | 1 + conformance/inspect-volumes-pod.yaml | 32 +++++++++++++++++++ 27 files changed, 91 insertions(+), 9 deletions(-) create mode 100644 conformance/badges/command_line_tool.json create mode 100644 conformance/badges/conditional.json create mode 100644 conformance/badges/docker.json create mode 100644 conformance/badges/env_var.json create mode 100644 conformance/badges/expression_tool.json create mode 100644 conformance/badges/format_checking.json create mode 100644 conformance/badges/initial_work_dir.json create mode 100644 conformance/badges/inline_javascript.json create mode 100644 conformance/badges/inplace_update.json create mode 100644 conformance/badges/input_object_requirements.json create mode 100644 conformance/badges/multiple.json create mode 100644 conformance/badges/multiple_input.json create mode 100644 conformance/badges/networkaccess.json create mode 100644 conformance/badges/required.json create mode 100644 conformance/badges/resource.json create mode 100644 conformance/badges/scatter.json create mode 100644 conformance/badges/schema_def.json create mode 100644 conformance/badges/secondary_files.json create mode 100644 conformance/badges/shell_command.json create mode 100644 conformance/badges/step_input.json create mode 100644 conformance/badges/step_input_expression.json create mode 100644 conformance/badges/subworkflow.json create mode 100644 conformance/badges/timelimit.json create mode 100644 conformance/badges/workflow.json create mode 100644 conformance/inspect-volumes-pod.yaml diff --git a/conformance/ConformanceTestsJob-1.2.yaml b/conformance/ConformanceTestsJob-1.2.yaml index 3dfc23f..6200e2f 100644 --- a/conformance/ConformanceTestsJob-1.2.yaml +++ b/conformance/ConformanceTestsJob-1.2.yaml @@ -31,11 +31,21 @@ spec: - name: tests-1-2 image: docker.terradue.com/calrissian:conformance workingDir: "/conformance/cwl-v1.2-1.2.0" - command: ["./run_test.sh"] + command: ["cwltest"] args: - - "RUNNER=calrissian" - - "--verbose" - - "EXTRA=--max-ram 8G --max-cores 4 --default-container debian:stretch-slim" + - "--test" + - "/conformance/cwl-v1.2-1.2.0/conformance_tests.yaml" + - "--tool" + - "calrissian" + - "--badgedir" + - "/output/badges" + - "--" + - "--max-ram" + - "8G" + - "--max-cores" + - "4" + - "--default-container" + - "debian:stretch-slim" env: - name: CALRISSIAN_POD_NAME valueFrom: diff --git a/conformance/README.md b/conformance/README.md index 0914619..b645a60 100644 --- a/conformance/README.md +++ b/conformance/README.md @@ -24,19 +24,35 @@ Calrissian does not include cwltest, so build a container that installs it. ./build-conformance.sh ``` -This will build `calrissian:conformance` from the current source tree. You may need to tag that differently if pushing to a registry. If so, update the `image: ` in [ConformanceTestsJob-1.1.yaml](ConformanceTestsJob-1.1.yaml) +This will build `calrissian:conformance` from the current source tree. You may need to tag that differently if pushing to a registry. If so, update the `image: ` in [ConformanceTestsJob-1.2.yaml](ConformanceTestsJob-1.2.yaml) ### Running Conformance Tests -[ConformanceTestsJob-1.1.yaml](ConformanceTestsJob-1.1.yaml) uses `run_test.sh` from cwltool to run conformance tests with `RUNNER=calrissian` and Calrissian's required arguments in `EXTRA`. +[ConformanceTestsJob-1.2.yaml](ConformanceTestsJob-1.2.yaml) uses `cwltest` from cwltool to run conformance tests with `--tool calrissian` and Calrissian's required arguments after `--`. ``` -kubectl --namespace="$NAMESPACE_NAME" create -f ConformanceTestsJob-1.1.yaml +kubectl --namespace="$NAMESPACE_NAME" create -f ConformanceTestsJob-1.2.yaml kubectl --namespace="$NAMESPACE_NAME" wait --for=condition=Ready\ - --selector=job-name=conformance-tests-1-1 pods -kubectl --namespace="$NAMESPACE_NAME" logs -f jobs/conformance-tests-1-1 + --selector=job-name=conformance-tests-1-2 pods +kubectl --namespace="$NAMESPACE_NAME" logs -f jobs/conformance-tests-1-2 ``` +### Inspect the volumes content + +Create a pod to inspect the volume with: + +``` +kubectl --namespace="$NAMESPACE_NAME"n apply -f inspect-volumes-pod.yaml +``` + +Open a shell in the pod with: + +``` + kubectl --namespace="$NAMESPACE_NAME" exec --stdin --tty inspect-volumes -- /bin/bash +``` + +Inpect the content of `/output` with `ls -l /output` + ### Notes: - Calrissian requires specifying an envelope of RAM and CPU resources to use in the cluster, so these are provided as `--max-ram` and `--max-cores` diff --git a/conformance/badges/command_line_tool.json b/conformance/badges/command_line_tool.json new file mode 100644 index 0000000..f65dba2 --- /dev/null +++ b/conformance/badges/command_line_tool.json @@ -0,0 +1 @@ +{"subject": "command_line_tool", "status": "94%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/conditional.json b/conformance/badges/conditional.json new file mode 100644 index 0000000..0ca760e --- /dev/null +++ b/conformance/badges/conditional.json @@ -0,0 +1 @@ +{"subject": "conditional", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/docker.json b/conformance/badges/docker.json new file mode 100644 index 0000000..1d2cb5a --- /dev/null +++ b/conformance/badges/docker.json @@ -0,0 +1 @@ +{"subject": "docker", "status": "80%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/env_var.json b/conformance/badges/env_var.json new file mode 100644 index 0000000..94c5ea6 --- /dev/null +++ b/conformance/badges/env_var.json @@ -0,0 +1 @@ +{"subject": "env_var", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/expression_tool.json b/conformance/badges/expression_tool.json new file mode 100644 index 0000000..0aa7dfc --- /dev/null +++ b/conformance/badges/expression_tool.json @@ -0,0 +1 @@ +{"subject": "expression_tool", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/format_checking.json b/conformance/badges/format_checking.json new file mode 100644 index 0000000..6f0256f --- /dev/null +++ b/conformance/badges/format_checking.json @@ -0,0 +1 @@ +{"subject": "format_checking", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/initial_work_dir.json b/conformance/badges/initial_work_dir.json new file mode 100644 index 0000000..a330022 --- /dev/null +++ b/conformance/badges/initial_work_dir.json @@ -0,0 +1 @@ +{"subject": "initial_work_dir", "status": "89%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/inline_javascript.json b/conformance/badges/inline_javascript.json new file mode 100644 index 0000000..77d3a22 --- /dev/null +++ b/conformance/badges/inline_javascript.json @@ -0,0 +1 @@ +{"subject": "inline_javascript", "status": "99%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/inplace_update.json b/conformance/badges/inplace_update.json new file mode 100644 index 0000000..98db05f --- /dev/null +++ b/conformance/badges/inplace_update.json @@ -0,0 +1 @@ +{"subject": "inplace_update", "status": "0%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/input_object_requirements.json b/conformance/badges/input_object_requirements.json new file mode 100644 index 0000000..57d1eae --- /dev/null +++ b/conformance/badges/input_object_requirements.json @@ -0,0 +1 @@ +{"subject": "input_object_requirements", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/multiple.json b/conformance/badges/multiple.json new file mode 100644 index 0000000..be8d35c --- /dev/null +++ b/conformance/badges/multiple.json @@ -0,0 +1 @@ +{"subject": "multiple", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/multiple_input.json b/conformance/badges/multiple_input.json new file mode 100644 index 0000000..7c758a4 --- /dev/null +++ b/conformance/badges/multiple_input.json @@ -0,0 +1 @@ +{"subject": "multiple_input", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/networkaccess.json b/conformance/badges/networkaccess.json new file mode 100644 index 0000000..c5a4788 --- /dev/null +++ b/conformance/badges/networkaccess.json @@ -0,0 +1 @@ +{"subject": "networkaccess", "status": "50%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/required.json b/conformance/badges/required.json new file mode 100644 index 0000000..720ce59 --- /dev/null +++ b/conformance/badges/required.json @@ -0,0 +1 @@ +{"subject": "required", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/resource.json b/conformance/badges/resource.json new file mode 100644 index 0000000..0cda6b0 --- /dev/null +++ b/conformance/badges/resource.json @@ -0,0 +1 @@ +{"subject": "resource", "status": "81%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/scatter.json b/conformance/badges/scatter.json new file mode 100644 index 0000000..4ea16ca --- /dev/null +++ b/conformance/badges/scatter.json @@ -0,0 +1 @@ +{"subject": "scatter", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/schema_def.json b/conformance/badges/schema_def.json new file mode 100644 index 0000000..f635d69 --- /dev/null +++ b/conformance/badges/schema_def.json @@ -0,0 +1 @@ +{"subject": "schema_def", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/secondary_files.json b/conformance/badges/secondary_files.json new file mode 100644 index 0000000..017c31d --- /dev/null +++ b/conformance/badges/secondary_files.json @@ -0,0 +1 @@ +{"subject": "secondary_files", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/shell_command.json b/conformance/badges/shell_command.json new file mode 100644 index 0000000..f74b75a --- /dev/null +++ b/conformance/badges/shell_command.json @@ -0,0 +1 @@ +{"subject": "shell_command", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/step_input.json b/conformance/badges/step_input.json new file mode 100644 index 0000000..de6c670 --- /dev/null +++ b/conformance/badges/step_input.json @@ -0,0 +1 @@ +{"subject": "step_input", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/step_input_expression.json b/conformance/badges/step_input_expression.json new file mode 100644 index 0000000..7dff650 --- /dev/null +++ b/conformance/badges/step_input_expression.json @@ -0,0 +1 @@ +{"subject": "step_input_expression", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/subworkflow.json b/conformance/badges/subworkflow.json new file mode 100644 index 0000000..28c8934 --- /dev/null +++ b/conformance/badges/subworkflow.json @@ -0,0 +1 @@ +{"subject": "subworkflow", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/timelimit.json b/conformance/badges/timelimit.json new file mode 100644 index 0000000..7822929 --- /dev/null +++ b/conformance/badges/timelimit.json @@ -0,0 +1 @@ +{"subject": "timelimit", "status": "77%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/workflow.json b/conformance/badges/workflow.json new file mode 100644 index 0000000..4791c72 --- /dev/null +++ b/conformance/badges/workflow.json @@ -0,0 +1 @@ +{"subject": "workflow", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/inspect-volumes-pod.yaml b/conformance/inspect-volumes-pod.yaml new file mode 100644 index 0000000..8f3c114 --- /dev/null +++ b/conformance/inspect-volumes-pod.yaml @@ -0,0 +1,32 @@ +apiVersion: v1 +kind: Pod +metadata: + name: inspect-volumes +spec: + volumes: + - name: shared-data + emptyDir: {} + containers: + - name: nginx + image: nginx:latest + volumeMounts: + - mountPath: /conformance + name: conformance-test-data-1-2 + readOnly: true + - mountPath: /output + name: conformance-output-data-1-2 + env: + - name: CALRISSIAN_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + volumes: + - name: conformance-test-data-1-2 + persistentVolumeClaim: + claimName: conformance-test-data-1-2 + readOnly: true + - name: conformance-output-data-1-2 + persistentVolumeClaim: + claimName: conformance-output-data-1-2 + hostNetwork: true + dnsPolicy: Default From 0b283f538e230341fcd39dcbdc1dac4c1ec978cb Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Thu, 10 Feb 2022 10:30:03 +0100 Subject: [PATCH 04/28] Update README.md --- conformance/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conformance/README.md b/conformance/README.md index b645a60..04f3e28 100644 --- a/conformance/README.md +++ b/conformance/README.md @@ -1,5 +1,8 @@ # Calrissian - CWL Conformance Tests +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/command_line_tool.json?icon=commonwl) + + This is under development, and will eventually be automated to run in a CI environment. However, the resources here can be used to run [CWL conformance tests](https://github.com/common-workflow-language/common-workflow-language/blob/master/CONFORMANCE_TESTS.md) on a Kubernetes cluster. ### Cluster Preparation From 769ac00e1042cedbc652c45ec0d484584336a88d Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Thu, 10 Feb 2022 10:31:06 +0100 Subject: [PATCH 05/28] Update README.md --- conformance/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conformance/README.md b/conformance/README.md index 04f3e28..43746b5 100644 --- a/conformance/README.md +++ b/conformance/README.md @@ -1,7 +1,7 @@ # Calrissian - CWL Conformance Tests ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/command_line_tool.json?icon=commonwl) - +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/conditional.json?icon=commonwl) This is under development, and will eventually be automated to run in a CI environment. However, the resources here can be used to run [CWL conformance tests](https://github.com/common-workflow-language/common-workflow-language/blob/master/CONFORMANCE_TESTS.md) on a Kubernetes cluster. From 248ba11a8c6ae69693c155a0ca6dc4b52791dd72 Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Thu, 10 Feb 2022 10:35:24 +0100 Subject: [PATCH 06/28] Update README.md --- conformance/README.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/conformance/README.md b/conformance/README.md index 43746b5..5fb724f 100644 --- a/conformance/README.md +++ b/conformance/README.md @@ -2,6 +2,34 @@ ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/command_line_tool.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/conditional.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/docker.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/env_var.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/expression_tool.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/format_checking.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/initial_work_dir.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/inline_javascript.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/inplace_update.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/input_object_requirements.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/multiple.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/multiple_input.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/networkaccess.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/required.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/resource.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/scatter.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/schema_def.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/secondary_files.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/shell_command.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/step_input.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/step_input_expression.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/subworkflow.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/timelimit.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/workflow.json?icon=commonwl) + + + + + + This is under development, and will eventually be automated to run in a CI environment. However, the resources here can be used to run [CWL conformance tests](https://github.com/common-workflow-language/common-workflow-language/blob/master/CONFORMANCE_TESTS.md) on a Kubernetes cluster. From 51a15c5b64e149da5d6a46b5bfbcaf1482ebe257 Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Thu, 10 Feb 2022 10:36:01 +0100 Subject: [PATCH 07/28] Update README.md --- conformance/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conformance/README.md b/conformance/README.md index 5fb724f..eec9a18 100644 --- a/conformance/README.md +++ b/conformance/README.md @@ -1,5 +1,7 @@ # Calrissian - CWL Conformance Tests +## Badges for 1.2.0 + ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/command_line_tool.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/conditional.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/docker.json?icon=commonwl) From 12a3361bb668316cb1cc48dcf9f7873e20be1084 Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Thu, 10 Feb 2022 10:41:21 +0100 Subject: [PATCH 08/28] instructions to copy the badges --- conformance/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conformance/README.md b/conformance/README.md index eec9a18..57c58b3 100644 --- a/conformance/README.md +++ b/conformance/README.md @@ -86,6 +86,12 @@ Open a shell in the pod with: Inpect the content of `/output` with `ls -l /output` +### Copy the badges + +``` +kubectl cp $NAMESPACE_NAME/inspect-volumes:/output/badges/ badges/ +``` + ### Notes: - Calrissian requires specifying an envelope of RAM and CPU resources to use in the cluster, so these are provided as `--max-ram` and `--max-cores` From 47d4ed4a68ff666f8f76ea3b24cdd15c5ccde3a2 Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Thu, 10 Feb 2022 11:15:03 +0100 Subject: [PATCH 09/28] tidy badges --- conformance/README.md | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/conformance/README.md b/conformance/README.md index 57c58b3..b6e4401 100644 --- a/conformance/README.md +++ b/conformance/README.md @@ -1,12 +1,30 @@ # Calrissian - CWL Conformance Tests -## Badges for 1.2.0 +## Conformance tests for CWL v1.0 for the latest release +Coming soon + +## Conformance tests for CWL v1.1 for the latest release + +Coming soon + +## Conformance tests for CWL v1.2.0 for the latest release + +### Classes + +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/workflow.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/command_line_tool.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/expression_tool.json?icon=commonwl) + +### Required features + +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/required.json?icon=commonwl) + +### Optional features + ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/conditional.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/docker.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/env_var.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/expression_tool.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/format_checking.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/initial_work_dir.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/inline_javascript.json?icon=commonwl) @@ -15,7 +33,6 @@ ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/multiple.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/multiple_input.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/networkaccess.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/required.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/resource.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/scatter.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/schema_def.json?icon=commonwl) @@ -25,7 +42,6 @@ ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/step_input_expression.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/subworkflow.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/timelimit.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/workflow.json?icon=commonwl) From 0f6b9da79a757820a129c20e73955cff8ba45acb Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Thu, 10 Feb 2022 11:16:12 +0100 Subject: [PATCH 10/28] conformance --- conformance/README.md | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/conformance/README.md b/conformance/README.md index b6e4401..ad2d1df 100644 --- a/conformance/README.md +++ b/conformance/README.md @@ -1,5 +1,8 @@ # Calrissian - CWL Conformance Tests +This is under development, and will eventually be automated to run in a CI environment. However, the resources here can be used to run [CWL conformance tests](https://github.com/common-workflow-language/common-workflow-language/blob/master/CONFORMANCE_TESTS.md) on a Kubernetes cluster. + + ## Conformance tests for CWL v1.0 for the latest release Coming soon @@ -43,14 +46,6 @@ Coming soon ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/subworkflow.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/timelimit.json?icon=commonwl) - - - - - - -This is under development, and will eventually be automated to run in a CI environment. However, the resources here can be used to run [CWL conformance tests](https://github.com/common-workflow-language/common-workflow-language/blob/master/CONFORMANCE_TESTS.md) on a Kubernetes cluster. - ### Cluster Preparation To run the conformance tests, follow the instructions in the **Creating Namespace and Roles** section of [examples/README.md](../examples/README.md). You do not need to create any VolumeClaims from the examples. From e97210eccdcc645a1b3e418276d3ac4e832f786e Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Mon, 14 Feb 2022 16:51:11 +0100 Subject: [PATCH 11/28] badges --- conformance/ConformanceTestsJob-1.1.yaml | 20 ++++++++++++++----- .../badges/1.1.0/command_line_tool.json | 1 + conformance/badges/1.1.0/docker.json | 1 + conformance/badges/{ => 1.1.0}/env_var.json | 0 .../badges/{ => 1.1.0}/expression_tool.json | 0 .../badges/{ => 1.1.0}/format_checking.json | 0 .../badges/1.1.0/initial_work_dir.json | 1 + .../badges/1.1.0/inline_javascript.json | 1 + .../badges/{ => 1.1.0}/inplace_update.json | 0 .../input_object_requirements.json | 0 .../badges/{ => 1.1.0}/multiple_input.json | 0 .../badges/{ => 1.1.0}/networkaccess.json | 0 conformance/badges/{ => 1.1.0}/required.json | 0 conformance/badges/1.1.0/resource.json | 1 + conformance/badges/{ => 1.1.0}/scatter.json | 0 .../badges/{ => 1.1.0}/schema_def.json | 0 .../badges/{ => 1.1.0}/shell_command.json | 0 .../badges/{ => 1.1.0}/step_input.json | 0 .../{ => 1.1.0}/step_input_expression.json | 0 .../badges/{ => 1.1.0}/subworkflow.json | 0 conformance/badges/{ => 1.1.0}/timelimit.json | 0 conformance/badges/{ => 1.1.0}/workflow.json | 0 .../badges/{ => 1.2.1}/command_line_tool.json | 0 .../badges/{ => 1.2.1}/conditional.json | 0 conformance/badges/{ => 1.2.1}/docker.json | 0 conformance/badges/1.2.1/env_var.json | 1 + conformance/badges/1.2.1/expression_tool.json | 1 + conformance/badges/1.2.1/format_checking.json | 1 + .../badges/{ => 1.2.1}/initial_work_dir.json | 0 .../badges/{ => 1.2.1}/inline_javascript.json | 0 conformance/badges/1.2.1/inplace_update.json | 1 + .../1.2.1/input_object_requirements.json | 1 + conformance/badges/{ => 1.2.1}/multiple.json | 0 conformance/badges/1.2.1/multiple_input.json | 1 + conformance/badges/1.2.1/networkaccess.json | 1 + conformance/badges/1.2.1/required.json | 1 + conformance/badges/{ => 1.2.1}/resource.json | 0 conformance/badges/1.2.1/scatter.json | 1 + conformance/badges/1.2.1/schema_def.json | 1 + .../badges/{ => 1.2.1}/secondary_files.json | 0 conformance/badges/1.2.1/shell_command.json | 1 + conformance/badges/1.2.1/step_input.json | 1 + .../badges/1.2.1/step_input_expression.json | 1 + conformance/badges/1.2.1/subworkflow.json | 1 + conformance/badges/1.2.1/timelimit.json | 1 + conformance/badges/1.2.1/workflow.json | 1 + 46 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 conformance/badges/1.1.0/command_line_tool.json create mode 100644 conformance/badges/1.1.0/docker.json rename conformance/badges/{ => 1.1.0}/env_var.json (100%) rename conformance/badges/{ => 1.1.0}/expression_tool.json (100%) rename conformance/badges/{ => 1.1.0}/format_checking.json (100%) create mode 100644 conformance/badges/1.1.0/initial_work_dir.json create mode 100644 conformance/badges/1.1.0/inline_javascript.json rename conformance/badges/{ => 1.1.0}/inplace_update.json (100%) rename conformance/badges/{ => 1.1.0}/input_object_requirements.json (100%) rename conformance/badges/{ => 1.1.0}/multiple_input.json (100%) rename conformance/badges/{ => 1.1.0}/networkaccess.json (100%) rename conformance/badges/{ => 1.1.0}/required.json (100%) create mode 100644 conformance/badges/1.1.0/resource.json rename conformance/badges/{ => 1.1.0}/scatter.json (100%) rename conformance/badges/{ => 1.1.0}/schema_def.json (100%) rename conformance/badges/{ => 1.1.0}/shell_command.json (100%) rename conformance/badges/{ => 1.1.0}/step_input.json (100%) rename conformance/badges/{ => 1.1.0}/step_input_expression.json (100%) rename conformance/badges/{ => 1.1.0}/subworkflow.json (100%) rename conformance/badges/{ => 1.1.0}/timelimit.json (100%) rename conformance/badges/{ => 1.1.0}/workflow.json (100%) rename conformance/badges/{ => 1.2.1}/command_line_tool.json (100%) rename conformance/badges/{ => 1.2.1}/conditional.json (100%) rename conformance/badges/{ => 1.2.1}/docker.json (100%) create mode 100644 conformance/badges/1.2.1/env_var.json create mode 100644 conformance/badges/1.2.1/expression_tool.json create mode 100644 conformance/badges/1.2.1/format_checking.json rename conformance/badges/{ => 1.2.1}/initial_work_dir.json (100%) rename conformance/badges/{ => 1.2.1}/inline_javascript.json (100%) create mode 100644 conformance/badges/1.2.1/inplace_update.json create mode 100644 conformance/badges/1.2.1/input_object_requirements.json rename conformance/badges/{ => 1.2.1}/multiple.json (100%) create mode 100644 conformance/badges/1.2.1/multiple_input.json create mode 100644 conformance/badges/1.2.1/networkaccess.json create mode 100644 conformance/badges/1.2.1/required.json rename conformance/badges/{ => 1.2.1}/resource.json (100%) create mode 100644 conformance/badges/1.2.1/scatter.json create mode 100644 conformance/badges/1.2.1/schema_def.json rename conformance/badges/{ => 1.2.1}/secondary_files.json (100%) create mode 100644 conformance/badges/1.2.1/shell_command.json create mode 100644 conformance/badges/1.2.1/step_input.json create mode 100644 conformance/badges/1.2.1/step_input_expression.json create mode 100644 conformance/badges/1.2.1/subworkflow.json create mode 100644 conformance/badges/1.2.1/timelimit.json create mode 100644 conformance/badges/1.2.1/workflow.json diff --git a/conformance/ConformanceTestsJob-1.1.yaml b/conformance/ConformanceTestsJob-1.1.yaml index 91da2a6..7b76894 100644 --- a/conformance/ConformanceTestsJob-1.1.yaml +++ b/conformance/ConformanceTestsJob-1.1.yaml @@ -15,7 +15,7 @@ spec: apiVersion: batch/v1 kind: Job metadata: - name: conformance-tests-1-1b + name: conformance-tests-1-1 spec: backoffLimit: 0 template: @@ -31,11 +31,21 @@ spec: - name: tests-1-1 image: docker.terradue.com/calrissian:conformance workingDir: "/conformance/cwl-v1.1-1.1.0" - command: ["./run_test.sh"] + command: ["cwltest"] args: - - "RUNNER=calrissian" - - "--verbose" - - "EXTRA=--max-ram 8G --max-cores 4 --default-container debian:stretch-slim" + - "--test" + - "/conformance/cwl-v1.1-1.1.0/conformance_tests.yaml" + - "--tool" + - "calrissian" + - "--badgedir" + - "/output/badges-1.1.0" + - "--" + - "--max-ram" + - "8G" + - "--max-cores" + - "4" + - "--default-container" + - "debian:stretch-slim" env: - name: CALRISSIAN_POD_NAME valueFrom: diff --git a/conformance/badges/1.1.0/command_line_tool.json b/conformance/badges/1.1.0/command_line_tool.json new file mode 100644 index 0000000..8c92527 --- /dev/null +++ b/conformance/badges/1.1.0/command_line_tool.json @@ -0,0 +1 @@ +{"subject": "command_line_tool", "status": "95%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/1.1.0/docker.json b/conformance/badges/1.1.0/docker.json new file mode 100644 index 0000000..9ef200b --- /dev/null +++ b/conformance/badges/1.1.0/docker.json @@ -0,0 +1 @@ +{"subject": "docker", "status": "70%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/env_var.json b/conformance/badges/1.1.0/env_var.json similarity index 100% rename from conformance/badges/env_var.json rename to conformance/badges/1.1.0/env_var.json diff --git a/conformance/badges/expression_tool.json b/conformance/badges/1.1.0/expression_tool.json similarity index 100% rename from conformance/badges/expression_tool.json rename to conformance/badges/1.1.0/expression_tool.json diff --git a/conformance/badges/format_checking.json b/conformance/badges/1.1.0/format_checking.json similarity index 100% rename from conformance/badges/format_checking.json rename to conformance/badges/1.1.0/format_checking.json diff --git a/conformance/badges/1.1.0/initial_work_dir.json b/conformance/badges/1.1.0/initial_work_dir.json new file mode 100644 index 0000000..d9d41f2 --- /dev/null +++ b/conformance/badges/1.1.0/initial_work_dir.json @@ -0,0 +1 @@ +{"subject": "initial_work_dir", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.1.0/inline_javascript.json b/conformance/badges/1.1.0/inline_javascript.json new file mode 100644 index 0000000..90e3689 --- /dev/null +++ b/conformance/badges/1.1.0/inline_javascript.json @@ -0,0 +1 @@ +{"subject": "inline_javascript", "status": "98%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/inplace_update.json b/conformance/badges/1.1.0/inplace_update.json similarity index 100% rename from conformance/badges/inplace_update.json rename to conformance/badges/1.1.0/inplace_update.json diff --git a/conformance/badges/input_object_requirements.json b/conformance/badges/1.1.0/input_object_requirements.json similarity index 100% rename from conformance/badges/input_object_requirements.json rename to conformance/badges/1.1.0/input_object_requirements.json diff --git a/conformance/badges/multiple_input.json b/conformance/badges/1.1.0/multiple_input.json similarity index 100% rename from conformance/badges/multiple_input.json rename to conformance/badges/1.1.0/multiple_input.json diff --git a/conformance/badges/networkaccess.json b/conformance/badges/1.1.0/networkaccess.json similarity index 100% rename from conformance/badges/networkaccess.json rename to conformance/badges/1.1.0/networkaccess.json diff --git a/conformance/badges/required.json b/conformance/badges/1.1.0/required.json similarity index 100% rename from conformance/badges/required.json rename to conformance/badges/1.1.0/required.json diff --git a/conformance/badges/1.1.0/resource.json b/conformance/badges/1.1.0/resource.json new file mode 100644 index 0000000..ccb504c --- /dev/null +++ b/conformance/badges/1.1.0/resource.json @@ -0,0 +1 @@ +{"subject": "resource", "status": "88%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/scatter.json b/conformance/badges/1.1.0/scatter.json similarity index 100% rename from conformance/badges/scatter.json rename to conformance/badges/1.1.0/scatter.json diff --git a/conformance/badges/schema_def.json b/conformance/badges/1.1.0/schema_def.json similarity index 100% rename from conformance/badges/schema_def.json rename to conformance/badges/1.1.0/schema_def.json diff --git a/conformance/badges/shell_command.json b/conformance/badges/1.1.0/shell_command.json similarity index 100% rename from conformance/badges/shell_command.json rename to conformance/badges/1.1.0/shell_command.json diff --git a/conformance/badges/step_input.json b/conformance/badges/1.1.0/step_input.json similarity index 100% rename from conformance/badges/step_input.json rename to conformance/badges/1.1.0/step_input.json diff --git a/conformance/badges/step_input_expression.json b/conformance/badges/1.1.0/step_input_expression.json similarity index 100% rename from conformance/badges/step_input_expression.json rename to conformance/badges/1.1.0/step_input_expression.json diff --git a/conformance/badges/subworkflow.json b/conformance/badges/1.1.0/subworkflow.json similarity index 100% rename from conformance/badges/subworkflow.json rename to conformance/badges/1.1.0/subworkflow.json diff --git a/conformance/badges/timelimit.json b/conformance/badges/1.1.0/timelimit.json similarity index 100% rename from conformance/badges/timelimit.json rename to conformance/badges/1.1.0/timelimit.json diff --git a/conformance/badges/workflow.json b/conformance/badges/1.1.0/workflow.json similarity index 100% rename from conformance/badges/workflow.json rename to conformance/badges/1.1.0/workflow.json diff --git a/conformance/badges/command_line_tool.json b/conformance/badges/1.2.1/command_line_tool.json similarity index 100% rename from conformance/badges/command_line_tool.json rename to conformance/badges/1.2.1/command_line_tool.json diff --git a/conformance/badges/conditional.json b/conformance/badges/1.2.1/conditional.json similarity index 100% rename from conformance/badges/conditional.json rename to conformance/badges/1.2.1/conditional.json diff --git a/conformance/badges/docker.json b/conformance/badges/1.2.1/docker.json similarity index 100% rename from conformance/badges/docker.json rename to conformance/badges/1.2.1/docker.json diff --git a/conformance/badges/1.2.1/env_var.json b/conformance/badges/1.2.1/env_var.json new file mode 100644 index 0000000..94c5ea6 --- /dev/null +++ b/conformance/badges/1.2.1/env_var.json @@ -0,0 +1 @@ +{"subject": "env_var", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.2.1/expression_tool.json b/conformance/badges/1.2.1/expression_tool.json new file mode 100644 index 0000000..0aa7dfc --- /dev/null +++ b/conformance/badges/1.2.1/expression_tool.json @@ -0,0 +1 @@ +{"subject": "expression_tool", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.2.1/format_checking.json b/conformance/badges/1.2.1/format_checking.json new file mode 100644 index 0000000..6f0256f --- /dev/null +++ b/conformance/badges/1.2.1/format_checking.json @@ -0,0 +1 @@ +{"subject": "format_checking", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/initial_work_dir.json b/conformance/badges/1.2.1/initial_work_dir.json similarity index 100% rename from conformance/badges/initial_work_dir.json rename to conformance/badges/1.2.1/initial_work_dir.json diff --git a/conformance/badges/inline_javascript.json b/conformance/badges/1.2.1/inline_javascript.json similarity index 100% rename from conformance/badges/inline_javascript.json rename to conformance/badges/1.2.1/inline_javascript.json diff --git a/conformance/badges/1.2.1/inplace_update.json b/conformance/badges/1.2.1/inplace_update.json new file mode 100644 index 0000000..98db05f --- /dev/null +++ b/conformance/badges/1.2.1/inplace_update.json @@ -0,0 +1 @@ +{"subject": "inplace_update", "status": "0%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/1.2.1/input_object_requirements.json b/conformance/badges/1.2.1/input_object_requirements.json new file mode 100644 index 0000000..57d1eae --- /dev/null +++ b/conformance/badges/1.2.1/input_object_requirements.json @@ -0,0 +1 @@ +{"subject": "input_object_requirements", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/multiple.json b/conformance/badges/1.2.1/multiple.json similarity index 100% rename from conformance/badges/multiple.json rename to conformance/badges/1.2.1/multiple.json diff --git a/conformance/badges/1.2.1/multiple_input.json b/conformance/badges/1.2.1/multiple_input.json new file mode 100644 index 0000000..7c758a4 --- /dev/null +++ b/conformance/badges/1.2.1/multiple_input.json @@ -0,0 +1 @@ +{"subject": "multiple_input", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.2.1/networkaccess.json b/conformance/badges/1.2.1/networkaccess.json new file mode 100644 index 0000000..c5a4788 --- /dev/null +++ b/conformance/badges/1.2.1/networkaccess.json @@ -0,0 +1 @@ +{"subject": "networkaccess", "status": "50%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/1.2.1/required.json b/conformance/badges/1.2.1/required.json new file mode 100644 index 0000000..720ce59 --- /dev/null +++ b/conformance/badges/1.2.1/required.json @@ -0,0 +1 @@ +{"subject": "required", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/resource.json b/conformance/badges/1.2.1/resource.json similarity index 100% rename from conformance/badges/resource.json rename to conformance/badges/1.2.1/resource.json diff --git a/conformance/badges/1.2.1/scatter.json b/conformance/badges/1.2.1/scatter.json new file mode 100644 index 0000000..4ea16ca --- /dev/null +++ b/conformance/badges/1.2.1/scatter.json @@ -0,0 +1 @@ +{"subject": "scatter", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.2.1/schema_def.json b/conformance/badges/1.2.1/schema_def.json new file mode 100644 index 0000000..f635d69 --- /dev/null +++ b/conformance/badges/1.2.1/schema_def.json @@ -0,0 +1 @@ +{"subject": "schema_def", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/secondary_files.json b/conformance/badges/1.2.1/secondary_files.json similarity index 100% rename from conformance/badges/secondary_files.json rename to conformance/badges/1.2.1/secondary_files.json diff --git a/conformance/badges/1.2.1/shell_command.json b/conformance/badges/1.2.1/shell_command.json new file mode 100644 index 0000000..f74b75a --- /dev/null +++ b/conformance/badges/1.2.1/shell_command.json @@ -0,0 +1 @@ +{"subject": "shell_command", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.2.1/step_input.json b/conformance/badges/1.2.1/step_input.json new file mode 100644 index 0000000..de6c670 --- /dev/null +++ b/conformance/badges/1.2.1/step_input.json @@ -0,0 +1 @@ +{"subject": "step_input", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.2.1/step_input_expression.json b/conformance/badges/1.2.1/step_input_expression.json new file mode 100644 index 0000000..7dff650 --- /dev/null +++ b/conformance/badges/1.2.1/step_input_expression.json @@ -0,0 +1 @@ +{"subject": "step_input_expression", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.2.1/subworkflow.json b/conformance/badges/1.2.1/subworkflow.json new file mode 100644 index 0000000..28c8934 --- /dev/null +++ b/conformance/badges/1.2.1/subworkflow.json @@ -0,0 +1 @@ +{"subject": "subworkflow", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.2.1/timelimit.json b/conformance/badges/1.2.1/timelimit.json new file mode 100644 index 0000000..7822929 --- /dev/null +++ b/conformance/badges/1.2.1/timelimit.json @@ -0,0 +1 @@ +{"subject": "timelimit", "status": "77%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/1.2.1/workflow.json b/conformance/badges/1.2.1/workflow.json new file mode 100644 index 0000000..4791c72 --- /dev/null +++ b/conformance/badges/1.2.1/workflow.json @@ -0,0 +1 @@ +{"subject": "workflow", "status": "100%", "color": "green"} \ No newline at end of file From 7825b425055ff00a4899b44dba697f169b9df101 Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Mon, 14 Feb 2022 16:51:29 +0100 Subject: [PATCH 12/28] conformance jobs --- conformance/ConformanceTestsJob-1.0.yaml | 21 ++++++++++++++++----- conformance/ConformanceTestsJob-1.2.1.yaml | 18 ++++++++++++++---- conformance/ConformanceTestsJob-1.2.yaml | 2 +- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/conformance/ConformanceTestsJob-1.0.yaml b/conformance/ConformanceTestsJob-1.0.yaml index 89605a1..b0c3f7d 100644 --- a/conformance/ConformanceTestsJob-1.0.yaml +++ b/conformance/ConformanceTestsJob-1.0.yaml @@ -5,10 +5,11 @@ metadata: name: conformance-output-data-1-0 spec: accessModes: - - ReadWriteOnce + - ReadWriteMany resources: requests: storage: 1Gi + storageClassName: longhorn --- apiVersion: batch/v1 kind: Job @@ -29,11 +30,21 @@ spec: - name: tests-1-0 image: docker.terradue.com/calrissian:conformance workingDir: "/conformance/common-workflow-language-1.0.2" - command: ["./run_test.sh"] + command: ["cwltest"] args: - - "RUNNER=calrissian" - - "--verbose" - - "EXTRA=--max-ram 8G --max-cores 4 --default-container debian:stretch-slim" + - "--test" + - "/conformance/common-workflow-language-1.0.2/v1.0/conformance_test_v1.0.yaml" + - "--tool" + - "calrissian" + - "--badgedir" + - "/output/badges-1.0.2" + - "--" + - "--max-ram" + - "8G" + - "--max-cores" + - "4" + - "--default-container" + - "debian:stretch-slim" env: - name: CALRISSIAN_POD_NAME valueFrom: diff --git a/conformance/ConformanceTestsJob-1.2.1.yaml b/conformance/ConformanceTestsJob-1.2.1.yaml index fbbe230..7998cdf 100644 --- a/conformance/ConformanceTestsJob-1.2.1.yaml +++ b/conformance/ConformanceTestsJob-1.2.1.yaml @@ -31,11 +31,21 @@ spec: - name: tests-1-2-1 image: docker.terradue.com/calrissian:conformance workingDir: "/conformance/cwl-v1.2-1.2.1_proposed" - command: ["./run_test.sh"] + command: ["cwltest"] args: - - "RUNNER=calrissian" - - "--verbose" - - "EXTRA=--max-ram 8G --max-cores 4 --default-container debian:stretch-slim" + - "--test" + - "/conformance/cwl-v1.2-1.2.1_proposed/conformance_tests.yaml" + - "--tool" + - "calrissian" + - "--badgedir" + - "/output/badges-1.2.1_proposed" + - "--" + - "--max-ram" + - "8G" + - "--max-cores" + - "4" + - "--default-container" + - "debian:stretch-slim" env: - name: CALRISSIAN_POD_NAME valueFrom: diff --git a/conformance/ConformanceTestsJob-1.2.yaml b/conformance/ConformanceTestsJob-1.2.yaml index 6200e2f..ffb4dd9 100644 --- a/conformance/ConformanceTestsJob-1.2.yaml +++ b/conformance/ConformanceTestsJob-1.2.yaml @@ -38,7 +38,7 @@ spec: - "--tool" - "calrissian" - "--badgedir" - - "/output/badges" + - "/output/badges-1.2.0" - "--" - "--max-ram" - "8G" From 571c590cb9215dceec4b1bed46f31861de2e4945 Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Mon, 14 Feb 2022 16:55:13 +0100 Subject: [PATCH 13/28] add badges for 1.1.0 --- conformance/README.md | 89 ++++++++++++++++++++++++++++++------------- 1 file changed, 63 insertions(+), 26 deletions(-) diff --git a/conformance/README.md b/conformance/README.md index ad2d1df..4b6f101 100644 --- a/conformance/README.md +++ b/conformance/README.md @@ -9,42 +9,74 @@ Coming soon ## Conformance tests for CWL v1.1 for the latest release -Coming soon +### Classes + +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/workflow.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/command_line_tool.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/expression_tool.json?icon=commonwl) + +### Required features + +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/required.json?icon=commonwl) + +### Optional features + +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/conditional.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/docker.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/env_var.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/format_checking.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/initial_work_dir.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/inline_javascript.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/inplace_update.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/input_object_requirements.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/multiple.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/multiple_input.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/networkaccess.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/resource.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/scatter.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/schema_def.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/secondary_files.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/shell_command.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/step_input.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/step_input_expression.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/subworkflow.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/timelimit.json?icon=commonwl) + ## Conformance tests for CWL v1.2.0 for the latest release ### Classes -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/workflow.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/command_line_tool.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/expression_tool.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/workflow.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/command_line_tool.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/expression_tool.json?icon=commonwl) ### Required features -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/required.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/required.json?icon=commonwl) ### Optional features -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/conditional.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/docker.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/env_var.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/format_checking.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/initial_work_dir.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/inline_javascript.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/inplace_update.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/input_object_requirements.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/multiple.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/multiple_input.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/networkaccess.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/resource.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/scatter.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/schema_def.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/secondary_files.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/shell_command.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/step_input.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/step_input_expression.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/subworkflow.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/timelimit.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/conditional.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/docker.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/env_var.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/format_checking.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/initial_work_dir.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/inline_javascript.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/inplace_update.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/input_object_requirements.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/multiple.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/multiple_input.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/networkaccess.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/resource.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/scatter.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/schema_def.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/secondary_files.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/shell_command.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/step_input.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/step_input_expression.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/subworkflow.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.2.1/timelimit.json?icon=commonwl) ### Cluster Preparation @@ -99,8 +131,13 @@ Inpect the content of `/output` with `ls -l /output` ### Copy the badges + +``` +kubectl cp $NAMESPACE_NAME/inspect-volumes:/output/badges-1.1.0/ badges/1.1.0 +``` + ``` -kubectl cp $NAMESPACE_NAME/inspect-volumes:/output/badges/ badges/ +kubectl cp $NAMESPACE_NAME/inspect-volumes:/output/badges-1.2.0/ badges/1.2.0 ``` ### Notes: From 60c420695e9329fda27061ea78000c793dd53f20 Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Mon, 14 Feb 2022 16:56:50 +0100 Subject: [PATCH 14/28] fixes badges for 1.1.0 --- conformance/README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/conformance/README.md b/conformance/README.md index 4b6f101..936f175 100644 --- a/conformance/README.md +++ b/conformance/README.md @@ -21,7 +21,6 @@ Coming soon ### Optional features -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/conditional.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/docker.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/env_var.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/format_checking.json?icon=commonwl) @@ -29,13 +28,11 @@ Coming soon ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/inline_javascript.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/inplace_update.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/input_object_requirements.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/multiple.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/multiple_input.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/networkaccess.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/resource.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/scatter.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/schema_def.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/secondary_files.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/shell_command.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/step_input.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.1.0/step_input_expression.json?icon=commonwl) From 7d9f3d6be2961eff0bd4e5b8d57889502f4e9dbb Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Mon, 14 Feb 2022 17:49:12 +0100 Subject: [PATCH 15/28] badges 1.0.2 --- conformance/README.md | 31 ++++++++++++++++++- .../badges/1.0.2/command_line_tool.json | 1 + conformance/badges/1.0.2/docker.json | 1 + conformance/badges/1.0.2/env_var.json | 1 + conformance/badges/1.0.2/expression_tool.json | 1 + .../badges/1.0.2/initial_work_dir.json | 1 + .../badges/1.0.2/inline_javascript.json | 1 + conformance/badges/1.0.2/multiple_input.json | 1 + conformance/badges/1.0.2/required.json | 1 + conformance/badges/1.0.2/resource.json | 1 + conformance/badges/1.0.2/scatter.json | 1 + conformance/badges/1.0.2/schema_def.json | 1 + conformance/badges/1.0.2/shell_command.json | 1 + conformance/badges/1.0.2/step_input.json | 1 + .../badges/1.0.2/step_input_expression.json | 1 + conformance/badges/1.0.2/subworkflow.json | 1 + conformance/badges/1.0.2/workflow.json | 1 + 17 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 conformance/badges/1.0.2/command_line_tool.json create mode 100644 conformance/badges/1.0.2/docker.json create mode 100644 conformance/badges/1.0.2/env_var.json create mode 100644 conformance/badges/1.0.2/expression_tool.json create mode 100644 conformance/badges/1.0.2/initial_work_dir.json create mode 100644 conformance/badges/1.0.2/inline_javascript.json create mode 100644 conformance/badges/1.0.2/multiple_input.json create mode 100644 conformance/badges/1.0.2/required.json create mode 100644 conformance/badges/1.0.2/resource.json create mode 100644 conformance/badges/1.0.2/scatter.json create mode 100644 conformance/badges/1.0.2/schema_def.json create mode 100644 conformance/badges/1.0.2/shell_command.json create mode 100644 conformance/badges/1.0.2/step_input.json create mode 100644 conformance/badges/1.0.2/step_input_expression.json create mode 100644 conformance/badges/1.0.2/subworkflow.json create mode 100644 conformance/badges/1.0.2/workflow.json diff --git a/conformance/README.md b/conformance/README.md index 936f175..592cc34 100644 --- a/conformance/README.md +++ b/conformance/README.md @@ -5,7 +5,36 @@ This is under development, and will eventually be automated to run in a CI envir ## Conformance tests for CWL v1.0 for the latest release -Coming soon +### Classes + +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/workflow.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/command_line_tool.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/expression_tool.json?icon=commonwl) + +### Required features + +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/required.json?icon=commonwl) + +### Optional features + +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/docker.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/env_var.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/format_checking.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/initial_work_dir.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/inline_javascript.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/inplace_update.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/input_object_requirements.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/multiple_input.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/networkaccess.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/resource.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/scatter.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/schema_def.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/shell_command.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/step_input.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/step_input_expression.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/subworkflow.json?icon=commonwl) +![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/timelimit.json?icon=commonwl) + ## Conformance tests for CWL v1.1 for the latest release diff --git a/conformance/badges/1.0.2/command_line_tool.json b/conformance/badges/1.0.2/command_line_tool.json new file mode 100644 index 0000000..851e9c9 --- /dev/null +++ b/conformance/badges/1.0.2/command_line_tool.json @@ -0,0 +1 @@ +{"subject": "command_line_tool", "status": "97%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/1.0.2/docker.json b/conformance/badges/1.0.2/docker.json new file mode 100644 index 0000000..b48ae9b --- /dev/null +++ b/conformance/badges/1.0.2/docker.json @@ -0,0 +1 @@ +{"subject": "docker", "status": "75%", "color": "yellow"} \ No newline at end of file diff --git a/conformance/badges/1.0.2/env_var.json b/conformance/badges/1.0.2/env_var.json new file mode 100644 index 0000000..94c5ea6 --- /dev/null +++ b/conformance/badges/1.0.2/env_var.json @@ -0,0 +1 @@ +{"subject": "env_var", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.0.2/expression_tool.json b/conformance/badges/1.0.2/expression_tool.json new file mode 100644 index 0000000..0aa7dfc --- /dev/null +++ b/conformance/badges/1.0.2/expression_tool.json @@ -0,0 +1 @@ +{"subject": "expression_tool", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.0.2/initial_work_dir.json b/conformance/badges/1.0.2/initial_work_dir.json new file mode 100644 index 0000000..d9d41f2 --- /dev/null +++ b/conformance/badges/1.0.2/initial_work_dir.json @@ -0,0 +1 @@ +{"subject": "initial_work_dir", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.0.2/inline_javascript.json b/conformance/badges/1.0.2/inline_javascript.json new file mode 100644 index 0000000..cd29e4d --- /dev/null +++ b/conformance/badges/1.0.2/inline_javascript.json @@ -0,0 +1 @@ +{"subject": "inline_javascript", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.0.2/multiple_input.json b/conformance/badges/1.0.2/multiple_input.json new file mode 100644 index 0000000..7c758a4 --- /dev/null +++ b/conformance/badges/1.0.2/multiple_input.json @@ -0,0 +1 @@ +{"subject": "multiple_input", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.0.2/required.json b/conformance/badges/1.0.2/required.json new file mode 100644 index 0000000..720ce59 --- /dev/null +++ b/conformance/badges/1.0.2/required.json @@ -0,0 +1 @@ +{"subject": "required", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.0.2/resource.json b/conformance/badges/1.0.2/resource.json new file mode 100644 index 0000000..8e4c3a1 --- /dev/null +++ b/conformance/badges/1.0.2/resource.json @@ -0,0 +1 @@ +{"subject": "resource", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.0.2/scatter.json b/conformance/badges/1.0.2/scatter.json new file mode 100644 index 0000000..4ea16ca --- /dev/null +++ b/conformance/badges/1.0.2/scatter.json @@ -0,0 +1 @@ +{"subject": "scatter", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.0.2/schema_def.json b/conformance/badges/1.0.2/schema_def.json new file mode 100644 index 0000000..f635d69 --- /dev/null +++ b/conformance/badges/1.0.2/schema_def.json @@ -0,0 +1 @@ +{"subject": "schema_def", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.0.2/shell_command.json b/conformance/badges/1.0.2/shell_command.json new file mode 100644 index 0000000..f74b75a --- /dev/null +++ b/conformance/badges/1.0.2/shell_command.json @@ -0,0 +1 @@ +{"subject": "shell_command", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.0.2/step_input.json b/conformance/badges/1.0.2/step_input.json new file mode 100644 index 0000000..de6c670 --- /dev/null +++ b/conformance/badges/1.0.2/step_input.json @@ -0,0 +1 @@ +{"subject": "step_input", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.0.2/step_input_expression.json b/conformance/badges/1.0.2/step_input_expression.json new file mode 100644 index 0000000..7dff650 --- /dev/null +++ b/conformance/badges/1.0.2/step_input_expression.json @@ -0,0 +1 @@ +{"subject": "step_input_expression", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.0.2/subworkflow.json b/conformance/badges/1.0.2/subworkflow.json new file mode 100644 index 0000000..28c8934 --- /dev/null +++ b/conformance/badges/1.0.2/subworkflow.json @@ -0,0 +1 @@ +{"subject": "subworkflow", "status": "100%", "color": "green"} \ No newline at end of file diff --git a/conformance/badges/1.0.2/workflow.json b/conformance/badges/1.0.2/workflow.json new file mode 100644 index 0000000..4791c72 --- /dev/null +++ b/conformance/badges/1.0.2/workflow.json @@ -0,0 +1 @@ +{"subject": "workflow", "status": "100%", "color": "green"} \ No newline at end of file From ce26a0d2d2bc6900391e2e5dcf25535c74d645eb Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Mon, 14 Feb 2022 17:50:18 +0100 Subject: [PATCH 16/28] fixes badges for 1.0.2 --- conformance/README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conformance/README.md b/conformance/README.md index 592cc34..34d84da 100644 --- a/conformance/README.md +++ b/conformance/README.md @@ -19,13 +19,10 @@ This is under development, and will eventually be automated to run in a CI envir ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/docker.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/env_var.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/format_checking.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/initial_work_dir.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/inline_javascript.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/inplace_update.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/input_object_requirements.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/multiple_input.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/networkaccess.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/resource.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/scatter.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/schema_def.json?icon=commonwl) @@ -33,7 +30,6 @@ This is under development, and will eventually be automated to run in a CI envir ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/step_input.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/step_input_expression.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/subworkflow.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/timelimit.json?icon=commonwl) ## Conformance tests for CWL v1.1 for the latest release From 14a3689c96a5525e3b21b851d439ca331144717f Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Mon, 14 Feb 2022 17:51:53 +0100 Subject: [PATCH 17/28] fixes badges --- conformance/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/conformance/README.md b/conformance/README.md index 34d84da..e6cf2fc 100644 --- a/conformance/README.md +++ b/conformance/README.md @@ -21,7 +21,6 @@ This is under development, and will eventually be automated to run in a CI envir ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/env_var.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/initial_work_dir.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/inline_javascript.json?icon=commonwl) -![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/input_object_requirements.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/multiple_input.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/resource.json?icon=commonwl) ![test result](https://flat.badgen.net/https/raw.githubusercontent.com/Terradue/calrissian/conformance-1.2.1/conformance/badges/1.0.2/scatter.json?icon=commonwl) From 558030018191c8ab662a8d17e2abd0bf51b641fd Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Thu, 12 May 2022 09:09:52 +0200 Subject: [PATCH 18/28] Update README.md --- conformance/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conformance/README.md b/conformance/README.md index e6cf2fc..1159177 100644 --- a/conformance/README.md +++ b/conformance/README.md @@ -139,7 +139,7 @@ kubectl --namespace="$NAMESPACE_NAME" logs -f jobs/conformance-tests-1-2 Create a pod to inspect the volume with: ``` -kubectl --namespace="$NAMESPACE_NAME"n apply -f inspect-volumes-pod.yaml +kubectl --namespace="$NAMESPACE_NAME" apply -f inspect-volumes-pod.yaml ``` Open a shell in the pod with: From 7ea7986b72b303a12ff3d2d74e625b58b5d5d239 Mon Sep 17 00:00:00 2001 From: Fabrice Brito Date: Wed, 28 Sep 2022 17:01:49 +0200 Subject: [PATCH 19/28] gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5f2acd5..90f3d3c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ cwl/out calrissian/__pycache__/ calrissian.egg-info/ tests/__pycache__/ -.vscode \ No newline at end of file +.vscode +build \ No newline at end of file From c0ec099abb0d5e0a1793180fde1ef5f2db12a39d Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Thu, 10 Nov 2022 09:56:45 +0100 Subject: [PATCH 20/28] changed resource name for conformance tests --- conformance/ConformanceTestsJob-1.0.yaml | 4 ++-- conformance/ConformanceTestsJob-1.1.yaml | 4 ++-- conformance/ConformanceTestsJob-1.2.1.yaml | 4 ++-- conformance/ConformanceTestsJob-1.2.yaml | 4 ++-- conformance/StageConformanceTestsData.yaml | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/conformance/ConformanceTestsJob-1.0.yaml b/conformance/ConformanceTestsJob-1.0.yaml index b0c3f7d..bed7e21 100644 --- a/conformance/ConformanceTestsJob-1.0.yaml +++ b/conformance/ConformanceTestsJob-1.0.yaml @@ -9,7 +9,7 @@ spec: resources: requests: storage: 1Gi - storageClassName: longhorn + storageClassName: openebs-kernel-nfs-scw --- apiVersion: batch/v1 kind: Job @@ -28,7 +28,7 @@ spec: name: conformance-output-data-1-0 containers: - name: tests-1-0 - image: docker.terradue.com/calrissian:conformance + image: terradue/calrissian:conformance workingDir: "/conformance/common-workflow-language-1.0.2" command: ["cwltest"] args: diff --git a/conformance/ConformanceTestsJob-1.1.yaml b/conformance/ConformanceTestsJob-1.1.yaml index 7b76894..a465e65 100644 --- a/conformance/ConformanceTestsJob-1.1.yaml +++ b/conformance/ConformanceTestsJob-1.1.yaml @@ -9,7 +9,7 @@ spec: resources: requests: storage: 1Gi - storageClassName: longhorn + storageClassName: openebs-kernel-nfs-scw --- apiVersion: batch/v1 @@ -29,7 +29,7 @@ spec: name: conformance-output-data-1-1 containers: - name: tests-1-1 - image: docker.terradue.com/calrissian:conformance + image: terradue/calrissian:conformance workingDir: "/conformance/cwl-v1.1-1.1.0" command: ["cwltest"] args: diff --git a/conformance/ConformanceTestsJob-1.2.1.yaml b/conformance/ConformanceTestsJob-1.2.1.yaml index 7998cdf..99dcb6d 100644 --- a/conformance/ConformanceTestsJob-1.2.1.yaml +++ b/conformance/ConformanceTestsJob-1.2.1.yaml @@ -9,7 +9,7 @@ spec: resources: requests: storage: 1Gi - storageClassName: longhorn + storageClassName: openebs-kernel-nfs-scw --- apiVersion: batch/v1 @@ -29,7 +29,7 @@ spec: name: conformance-output-data-1-2-1 containers: - name: tests-1-2-1 - image: docker.terradue.com/calrissian:conformance + image: terradue/calrissian:conformance workingDir: "/conformance/cwl-v1.2-1.2.1_proposed" command: ["cwltest"] args: diff --git a/conformance/ConformanceTestsJob-1.2.yaml b/conformance/ConformanceTestsJob-1.2.yaml index ffb4dd9..5248edf 100644 --- a/conformance/ConformanceTestsJob-1.2.yaml +++ b/conformance/ConformanceTestsJob-1.2.yaml @@ -9,7 +9,7 @@ spec: resources: requests: storage: 1Gi - storageClassName: longhorn + storageClassName: openebs-kernel-nfs-scw --- apiVersion: batch/v1 @@ -29,7 +29,7 @@ spec: name: conformance-output-data-1-2 containers: - name: tests-1-2 - image: docker.terradue.com/calrissian:conformance + image: terradue/calrissian:conformance workingDir: "/conformance/cwl-v1.2-1.2.0" command: ["cwltest"] args: diff --git a/conformance/StageConformanceTestsData.yaml b/conformance/StageConformanceTestsData.yaml index 6bdaea4..8ce60b7 100644 --- a/conformance/StageConformanceTestsData.yaml +++ b/conformance/StageConformanceTestsData.yaml @@ -10,7 +10,7 @@ spec: resources: requests: storage: 1Gi - storageClassName: longhorn + storageClassName: openebs-kernel-nfs-scw --- apiVersion: v1 kind: PersistentVolumeClaim @@ -23,7 +23,7 @@ spec: resources: requests: storage: 1Gi - storageClassName: longhorn + storageClassName: openebs-kernel-nfs-scw --- apiVersion: v1 kind: PersistentVolumeClaim @@ -36,7 +36,7 @@ spec: resources: requests: storage: 1Gi - storageClassName: longhorn + storageClassName: openebs-kernel-nfs-scw --- apiVersion: v1 kind: PersistentVolumeClaim @@ -49,7 +49,7 @@ spec: resources: requests: storage: 1Gi - storageClassName: longhorn + storageClassName: openebs-kernel-nfs-scw --- apiVersion: batch/v1 kind: Job From c31c6d62c0e2054d3992f7ac330a4e9616c501cf Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Thu, 2 Feb 2023 10:42:47 +0100 Subject: [PATCH 21/28] updated changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95c2da7..18c896e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Added + +- adds an argument `--tool-logs-basepath ` that enable the tool to fetch the pod logs by tool specified in the workflow (PR #139) + +### Changed + +- contraints the pod to complete with a proper termination status or raise an exception. (PR #139) ## [v0.11.0] - 2022-11-10 From 2ea23ec232ff32b53496accbc9ab7cd55b980c8a Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Thu, 2 Feb 2023 11:38:36 +0100 Subject: [PATCH 22/28] must retry if IncompleteStatusException adapted tests env var to not wait --- .circleci/config.yml | 2 ++ calrissian/k8s.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c88e014..e4915cc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,6 +23,8 @@ jobs: command: | . venv/bin/activate nose2 + environment: + RETRY_ATTEMPTS: 10 deploy: docker: - image: circleci/python:3.7 diff --git a/calrissian/k8s.py b/calrissian/k8s.py index 624c6ed..e09b4a8 100644 --- a/calrissian/k8s.py +++ b/calrissian/k8s.py @@ -157,7 +157,7 @@ def follow_logs(self): log.info('[{}] follow_logs end'.format(pod_name)) - @retry_exponential_if_exception_type((ApiException, HTTPError,), log) + @retry_exponential_if_exception_type((ApiException, HTTPError, IncompleteStatusException), log) def wait_for_completion(self) -> CompletionResult: w = watch.Watch() for event in w.stream(self.core_api_instance.list_namespaced_pod, self.namespace, field_selector=self._get_pod_field_selector()): From ee5be1b0987e9409c524019e06bc9c54cdb7d81f Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Fri, 3 Feb 2023 09:44:41 +0100 Subject: [PATCH 23/28] generic for minikube --- conformance/ConformanceTestsJob-1.2.1.yaml | 2 +- conformance/ConformanceTestsJob-1.2.yaml | 5 +++-- conformance/README.md | 6 ++++++ conformance/StageConformanceTestsData.yaml | 16 ++++------------ 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/conformance/ConformanceTestsJob-1.2.1.yaml b/conformance/ConformanceTestsJob-1.2.1.yaml index 99dcb6d..1bc9c42 100644 --- a/conformance/ConformanceTestsJob-1.2.1.yaml +++ b/conformance/ConformanceTestsJob-1.2.1.yaml @@ -9,7 +9,6 @@ spec: resources: requests: storage: 1Gi - storageClassName: openebs-kernel-nfs-scw --- apiVersion: batch/v1 @@ -39,6 +38,7 @@ spec: - "calrissian" - "--badgedir" - "/output/badges-1.2.1_proposed" + - "--verbose" - "--" - "--max-ram" - "8G" diff --git a/conformance/ConformanceTestsJob-1.2.yaml b/conformance/ConformanceTestsJob-1.2.yaml index 5248edf..6632016 100644 --- a/conformance/ConformanceTestsJob-1.2.yaml +++ b/conformance/ConformanceTestsJob-1.2.yaml @@ -9,7 +9,6 @@ spec: resources: requests: storage: 1Gi - storageClassName: openebs-kernel-nfs-scw --- apiVersion: batch/v1 @@ -29,7 +28,7 @@ spec: name: conformance-output-data-1-2 containers: - name: tests-1-2 - image: terradue/calrissian:conformance + image: calrissian:conformance workingDir: "/conformance/cwl-v1.2-1.2.0" command: ["cwltest"] args: @@ -51,6 +50,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.name + - name: RETRY_ATTEMPTS + value: "1" - name: TMPDIR value: "/output" volumeMounts: diff --git a/conformance/README.md b/conformance/README.md index 1159177..0e22695 100644 --- a/conformance/README.md +++ b/conformance/README.md @@ -123,6 +123,12 @@ Calrissian does not include cwltest, so build a container that installs it. This will build `calrissian:conformance` from the current source tree. You may need to tag that differently if pushing to a registry. If so, update the `image: ` in [ConformanceTestsJob-1.2.yaml](ConformanceTestsJob-1.2.yaml) +#### Pushing the container on Minikube + +``` +minikube image load calrissian:conformance +``` + ### Running Conformance Tests [ConformanceTestsJob-1.2.yaml](ConformanceTestsJob-1.2.yaml) uses `cwltest` from cwltool to run conformance tests with `--tool calrissian` and Calrissian's required arguments after `--`. diff --git a/conformance/StageConformanceTestsData.yaml b/conformance/StageConformanceTestsData.yaml index 8ce60b7..547ded1 100644 --- a/conformance/StageConformanceTestsData.yaml +++ b/conformance/StageConformanceTestsData.yaml @@ -5,12 +5,10 @@ metadata: name: conformance-test-data-1-0 spec: accessModes: - #- ReadWriteOnce - - ReadWriteMany + - ReadWriteOnce resources: requests: storage: 1Gi - storageClassName: openebs-kernel-nfs-scw --- apiVersion: v1 kind: PersistentVolumeClaim @@ -18,12 +16,10 @@ metadata: name: conformance-test-data-1-1 spec: accessModes: - #- ReadWriteOnce - - ReadWriteMany + - ReadWriteOnce resources: requests: storage: 1Gi - storageClassName: openebs-kernel-nfs-scw --- apiVersion: v1 kind: PersistentVolumeClaim @@ -31,12 +27,10 @@ metadata: name: conformance-test-data-1-2 spec: accessModes: - #- ReadWriteOnce - - ReadWriteMany + - ReadWriteOnce resources: requests: storage: 1Gi - storageClassName: openebs-kernel-nfs-scw --- apiVersion: v1 kind: PersistentVolumeClaim @@ -44,12 +38,10 @@ metadata: name: conformance-test-data-1-2-1 spec: accessModes: - #- ReadWriteOnce - - ReadWriteMany + - ReadWriteOnce resources: requests: storage: 1Gi - storageClassName: openebs-kernel-nfs-scw --- apiVersion: batch/v1 kind: Job From 0cb8f6ae6e54045ecc27be190e8cb68fcfe4c4ce Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Fri, 3 Feb 2023 09:47:53 +0100 Subject: [PATCH 24/28] update to latest cwltool --- .gitignore | 3 ++- requirements.txt | 42 ++---------------------------------------- setup.py | 2 +- 3 files changed, 5 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index b9d17c0..1b454c7 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ calrissian/__pycache__/ calrissian.egg-info/ tests/__pycache__/ .vscode -env37 \ No newline at end of file +env37 +build \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 644140f..b6e4f02 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,49 +1,11 @@ -adal==1.2.2 -asn1crypto==0.24.0 -bagit==1.7.0 -CacheControl==0.11.7 -cachetools==3.1.1 -certifi==2019.6.16 -# cffi==1.12.3 -chardet==3.0.4 -coloredlogs==10.0 -coverage==4.5.4 -cryptography==3.3.2 -cwltool==3.1.20211004060744 -decorator==4.4.0 -freezegun==0.3.12 -future==0.17.1 -google-auth==1.6.3 -humanfriendly==4.18 -idna==2.8 -isodate==0.6.0 +cwltool==3.1.20230201224320 kubernetes==10.0.1 -lockfile==0.12.2 -lxml==4.9.1 -mistune==0.8.4 -mypy-extensions==0.4.1 -networkx==2.3 +mypy-extensions==0.4.3 nose2==0.9.1 -oauthlib==3.0.2 -prov==1.5.1 -psutil==5.6.6 -pyasn1==0.4.6 -pyasn1-modules==0.2.6 -pycparser==2.19 -PyJWT==2.4.0 -pyparsing==2.4.2 -python-dateutil==2.8.0 PyYAML==5.4 -rdflib>=4.2.2,<5.1 requests==2.28.1 -rdflib-jsonld==0.6.2 -requests-oauthlib==1.2.0 -rsa==4.7 -ruamel.yaml>=0.12.4,<=0.16.5 scandir==1.10.0 schema-salad>=8.2.20210914115719,<9 shellescape>=3.4.1,<3.5 -six==1.12.0 tenacity==5.1.1 typing-extensions==3.7.4 -websocket-client==0.56.0 diff --git a/setup.py b/setup.py index 050918d..28e753a 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ def run(self): install_requires=[ 'urllib3>=1.24.2,<1.27', 'kubernetes==10.0.1', - 'cwltool==3.1.20211004060744', + 'cwltool==3.1.20230201224320', 'tenacity==5.1.1', ], test_suite='nose2.collector.collector', From b242baa29edb9e94583ab5610a1d3b514ee393e1 Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Fri, 3 Feb 2023 09:56:37 +0100 Subject: [PATCH 25/28] RETRY_ATTEMPTS decreased for faster tests --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e4915cc..27c01de 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ jobs: . venv/bin/activate nose2 environment: - RETRY_ATTEMPTS: 10 + RETRY_ATTEMPTS: 1 deploy: docker: - image: circleci/python:3.7 From 48569b89ec11b418b1006bf503cf17eaa47bce8b Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Fri, 3 Feb 2023 10:02:37 +0100 Subject: [PATCH 26/28] restored freezegun --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index b6e4f02..734722c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ cwltool==3.1.20230201224320 +freezegun==0.3.12 kubernetes==10.0.1 mypy-extensions==0.4.3 nose2==0.9.1 From baabbb246bd1ea72b1b5d7e638a9bbfbeb3c6eda Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Mon, 13 Feb 2023 13:55:01 +0100 Subject: [PATCH 27/28] ready to release 0.12.0 --- CHANGELOG.md | 3 ++- setup.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18c896e..4e52ac1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [v0.12.0] - 2023-02-13 ### Added - adds an argument `--tool-logs-basepath ` that enable the tool to fetch the pod logs by tool specified in the workflow (PR #139) +- returns proper exit code when the pod fails (PR #139) ### Changed diff --git a/setup.py b/setup.py index 28e753a..6ca7b66 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ # version checking derived from https://github.com/levlaz/circleci.py/blob/master/setup.py from setuptools.command.install import install -VERSION = '0.11.0' +VERSION = '0.12.0' TAG_ENV_VAR = 'CIRCLE_TAG' with open("README.md", "r") as fh: From 60b29478ca6c2efe695564c912092b4b9787efe2 Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Mon, 13 Feb 2023 13:58:30 +0100 Subject: [PATCH 28/28] fix release dep --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 6ca7b66..edeb1b5 100644 --- a/setup.py +++ b/setup.py @@ -36,6 +36,7 @@ def run(self): 'kubernetes==10.0.1', 'cwltool==3.1.20230201224320', 'tenacity==5.1.1', + 'importlib-metadata<5,>=0.23' ], test_suite='nose2.collector.collector', tests_require=['nose2'],