fix unit test

kubeflow · Jul 5, 2019 · 1d21c43 · 1d21c43
1 parent a6ffc32
commit 1d21c43
Show file tree

Hide file tree

Showing 3 changed files with 185 additions and 15 deletions.
diff --git a/sdk/python/kfp/dsl/_pipeline.py b/sdk/python/kfp/dsl/_pipeline.py
@@ -57,7 +57,7 @@ class PipelineConf():
   def __init__(self):
     self.image_pull_secrets = []
     self.timeout = 0
-    self.ttl_seconds_after_finished = None
+    self.ttl_seconds_after_finished = -1
     self.artifact_location = None
     self.op_transformers = []
 

diff --git a/sdk/python/pipeline.yaml b/sdk/python/pipeline.yaml
@@ -0,0 +1,170 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Workflow
+metadata:
+  generateName: pipeline-flip-coin-
+spec:
+  arguments:
+    parameters: []
+  entrypoint: pipeline-flip-coin
+  serviceAccountName: pipeline-runner
+  templates:
+  - dag:
+      tasks:
+      - arguments:
+          parameters:
+          - name: flip-again-output
+            value: '{{tasks.flip-again.outputs.parameters.flip-again-output}}'
+          - name: flip-output
+            value: '{{inputs.parameters.flip-output}}'
+        dependencies:
+        - flip-again
+        name: condition-2
+        template: condition-2
+        when: '{{tasks.flip-again.outputs.parameters.flip-again-output}} == tails'
+      - arguments:
+          parameters:
+          - name: flip-output
+            value: '{{inputs.parameters.flip-output}}'
+        name: flip-again
+        template: flip-again
+    inputs:
+      parameters:
+      - name: flip-output
+    name: condition-1
+    outputs:
+      parameters:
+      - name: flip-again-output
+        valueFrom:
+          parameter: '{{tasks.flip-again.outputs.parameters.flip-again-output}}'
+  - dag:
+      tasks:
+      - arguments:
+          parameters:
+          - name: flip-again-output
+            value: '{{inputs.parameters.flip-again-output}}'
+          - name: flip-output
+            value: '{{inputs.parameters.flip-output}}'
+        name: print1
+        template: print1
+    inputs:
+      parameters:
+      - name: flip-again-output
+      - name: flip-output
+    name: condition-2
+  - dag:
+      tasks:
+      - arguments:
+          parameters:
+          - name: flip-again-output
+            value: '{{inputs.parameters.flip-again-output}}'
+          - name: flip-output
+            value: '{{inputs.parameters.flip-output}}'
+        name: print2
+        template: print2
+    inputs:
+      parameters:
+      - name: flip-again-output
+      - name: flip-output
+    name: condition-3
+  - container:
+      args:
+      - python -c "import random; result = 'heads' if random.randint(0,1) == 0 else
+        'tails'; print(result)" | tee /tmp/output
+      command:
+      - sh
+      - -c
+      image: python:alpine3.6
+    name: flip
+    outputs:
+      artifacts:
+      - name: mlpipeline-ui-metadata
+        optional: true
+        path: /mlpipeline-ui-metadata.json
+      - name: mlpipeline-metrics
+        optional: true
+        path: /mlpipeline-metrics.json
+      parameters:
+      - name: flip-output
+        valueFrom:
+          path: /tmp/output
+  - container:
+      args:
+      - python -c "import random; result = 'heads' if random.randint(0,1) == 0 else
+        'tails'; print(result)" | tee /tmp/output
+      command:
+      - sh
+      - -c
+      image: python:alpine3.6
+    name: flip-again
+    outputs:
+      artifacts:
+      - name: mlpipeline-ui-metadata
+        optional: true
+        path: /mlpipeline-ui-metadata.json
+      - name: mlpipeline-metrics
+        optional: true
+        path: /mlpipeline-metrics.json
+      parameters:
+      - name: flip-again-output
+        valueFrom:
+          path: /tmp/output
+  - dag:
+      tasks:
+      - arguments:
+          parameters:
+          - name: flip-output
+            value: '{{tasks.flip.outputs.parameters.flip-output}}'
+        dependencies:
+        - flip
+        name: condition-1
+        template: condition-1
+        when: '{{tasks.flip.outputs.parameters.flip-output}} == heads'
+      - arguments:
+          parameters:
+          - name: flip-again-output
+            value: '{{tasks.condition-1.outputs.parameters.flip-again-output}}'
+          - name: flip-output
+            value: '{{tasks.flip.outputs.parameters.flip-output}}'
+        dependencies:
+        - condition-1
+        - flip
+        name: condition-3
+        template: condition-3
+        when: '{{tasks.flip.outputs.parameters.flip-output}} == tails'
+      - name: flip
+        template: flip
+    name: pipeline-flip-coin
+  - container:
+      command:
+      - echo
+      - '{{inputs.parameters.flip-again-output}}'
+      image: alpine:3.6
+    inputs:
+      parameters:
+      - name: flip-again-output
+    name: print1
+    outputs:
+      artifacts:
+      - name: mlpipeline-ui-metadata
+        optional: true
+        path: /mlpipeline-ui-metadata.json
+      - name: mlpipeline-metrics
+        optional: true
+        path: /mlpipeline-metrics.json
+  - container:
+      command:
+      - echo
+      - '{{inputs.parameters.flip-again-output}}'
+      image: alpine:3.6
+    inputs:
+      parameters:
+      - name: flip-again-output
+    name: print2
+    outputs:
+      artifacts:
+      - name: mlpipeline-ui-metadata
+        optional: true
+        path: /mlpipeline-ui-metadata.json
+      - name: mlpipeline-metrics
+        optional: true
+        path: /mlpipeline-metrics.json
diff --git a/sdk/python/tests/compiler/testdata/ttl_after_finished.yaml b/sdk/python/tests/compiler/testdata/ttl_after_finished.yaml
@@ -6,10 +6,22 @@ spec:
   arguments:
     parameters:
     - name: message
-  entrypoint: save-most-frequent
+  entrypoint: gc-after-finished
   ttlSecondsAfterFinished: 86400
   serviceAccountName: pipeline-runner
   templates:
+  - dag:
+      tasks:
+      - arguments:
+          parameters:
+          - name: message
+            value: '{{inputs.parameters.message}}'
+        name: get-frequent
+        template: get-frequent
+    inputs:
+      parameters:
+      - name: message
+    name: gc-after-finished
   - container:
       args:
       - python -c "from collections import Counter; words = Counter('{{inputs.parameters.message}}'.split());
@@ -33,16 +45,4 @@ spec:
       parameters:
       - name: get-frequent-word
         valueFrom:
-          path: /tmp/message.txt
-  - dag:
-      tasks:
-      - arguments:
-          parameters:
-          - name: message
-            value: '{{inputs.parameters.message}}'
-        name: get-frequent
-        template: get-frequent
-    inputs:
-      parameters:
-      - name: message
-    name: save-most-frequent
+          path: /tmp/message.txt