arg

InseeFrLab · Jan 10, 2024 · c70b658 · c70b658
1 parent 04c3270
commit c70b658
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/misc/argo-pipeline/pipeline.yaml b/misc/argo-pipeline/pipeline.yaml
@@ -14,6 +14,7 @@ spec:
         resources:
           requests:
             storage: 10Gi
+
   templates:
     - name: main
       dag:
@@ -26,10 +27,14 @@ spec:
                 value: "test/test-argo"
           - name: test-ign
             template: test-ign
+            dependencies: [ duplicate-ign ]
+            arguments:
+              artifacts:
+                - name: items
+                  from: "{{tasks.duplicate-ign.outputs.artifacts.items}}"
           - name: crossproduct
             template: crossproduct
             dependencies: [ duplicate-ign ]
-            withParam: "{{tasks.duplicate-ign.outputs.result}}"
           - name: print
             template: print
             dependencies: [ crossproduct ]
@@ -61,8 +66,8 @@ spec:
               revision: "docker"
       outputs:
         artifacts:
-          - name: tagc
-            path: /tmp/tagc.csv
+          - name: items
+            path: "/tmp/tagc.csv"
       container:
         image: inseefrlab/cartiflette
         command: [sh, -c]
@@ -94,13 +99,13 @@ spec:
     - name: test-ign
       inputs:
         artifacts:
-          - name: tagc
-            path: /tmp/tagc.csv
+          - name: items
+            path: "/tmp/tagc.csv"
       container:
         image: inseefrlab/cartiflette
         command: [sh, -c]
         args: ["python /mnt/bin/src/enrichissement.py --path /tmp/tagc.csv"]
-        
+
     - name: crossproduct
       container:
         image: inseefrlab/cartiflette
@@ -109,9 +114,6 @@ spec:
         args: ["python /mnt/bin/src/crossproduct.py"]
     - name: print
       inputs:
-        artifacts:
-          - name: tagc
-            path: /tmp/tagc.csv      
         parameters:
         - name: format
         - name: year

diff --git a/misc/argo-pipeline/src/duplicate_in_bucket.py b/misc/argo-pipeline/src/duplicate_in_bucket.py
@@ -73,4 +73,4 @@ def main(
 
 
 if __name__ == "__main__":
-    main()
+    main(path_within_bucket)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -73,4 +73,4 @@ def main(


		if __name__ == "__main__":
		main()
		main(path_within_bucket)