changed resource name for conformance tests

.circleci/config.yml

@@ -23,6 +23,8 @@ jobs:
           command: |
             . venv/bin/activate
             nose2
+          environment:
+            RETRY_ATTEMPTS: 1
   deploy:
     docker:
       - image: circleci/python:3.7

.gitignore

@@ -8,4 +8,4 @@ tests/__pycache__/
 .vscode
 env37
 build
-*.egg
+*.egg

CHANGELOG.md

@@ -5,8 +5,16 @@ 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 <local_folder_path>` 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
+
+- contraints the pod to complete with a proper termination status or raise an exception. (PR #139)
 
 ## [v0.11.0] - 2022-11-10
 

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()):

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: openebs-kernel-nfs-scw
 ---
 apiVersion: batch/v1
 kind: Job
@@ -27,13 +28,23 @@ spec:
           name: conformance-output-data-1-0
       containers:
       - name: tests-1-0
-        image: calrissian:conformance
+        image: terradue/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:

conformance/ConformanceTestsJob-1.1.yaml

@@ -5,10 +5,12 @@ metadata:
   name: conformance-output-data-1-1
 spec:
   accessModes:
-    - ReadWriteOnce
+    - ReadWriteMany
   resources:
     requests:
       storage: 1Gi
+  storageClassName: openebs-kernel-nfs-scw
+
 ---
 apiVersion: batch/v1
 kind: Job
@@ -27,13 +29,23 @@ spec:
           name: conformance-output-data-1-1
       containers:
       - name: tests-1-1
-        image: calrissian:conformance
+        image: terradue/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:

conformance/ConformanceTestsJob-1.2.1.yaml

@@ -0,0 +1,70 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: conformance-output-data-1-2-1
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 1Gi
+
+---
+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: terradue/calrissian:conformance
+        workingDir: "/conformance/cwl-v1.2-1.2.1_proposed"
+        command: ["cwltest"]
+        args:
+        - "--test"
+        - "/conformance/cwl-v1.2-1.2.1_proposed/conformance_tests.yaml"
+        - "--tool"
+        - "calrissian"
+        - "--badgedir"
+        - "/output/badges-1.2.1_proposed"
+        - "--verbose"
+        - "--"
+        - "--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

conformance/ConformanceTestsJob-1.2.yaml

@@ -0,0 +1,71 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: conformance-output-data-1-2
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 1Gi
+
+---
+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: calrissian:conformance
+        workingDir: "/conformance/cwl-v1.2-1.2.0"
+        command: ["cwltest"]
+        args:
+        - "--test"
+        - "/conformance/cwl-v1.2-1.2.0/conformance_tests.yaml"
+        - "--tool"
+        - "calrissian"
+        - "--badgedir"
+        - "/output/badges-1.2.0"
+        - "--"
+        - "--max-ram"
+        - "8G"
+        - "--max-cores"
+        - "4"
+        - "--default-container"
+        - "debian:stretch-slim"
+        env:
+        - name: CALRISSIAN_POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: RETRY_ATTEMPTS
+          value: "1"
+        - 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