Merge branch 'master' into feat/create-national-dem-workflow-tde-1166

linz · Nov 27, 2024 · fa649e1 · fa649e1
2 parents f5c994f + 54d8111
commit fa649e1
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/workflows/raster/standardising.yaml b/workflows/raster/standardising.yaml
@@ -43,7 +43,7 @@ spec:
         value: 'v7'
       - name: version_topo_imagery
         description: 'Specify a version of the topo-imagery image to use, e.g. "v4.8" or "latest"'
-        value: 'v6'
+        value: 'v7'
       - name: user_group
         description: Group of users running the workflow
         value: 'none'
@@ -413,8 +413,10 @@ spec:
                   value: '{{item}}'
                 - name: collection_id
                   value: '{{tasks.stac-setup.outputs.parameters.collection_id}}'
+                - name: current_datetime
+                  value: '{{tasks.stac-setup.finishedAt}}'
                 - name: target
-                  value: '{{tasks.get-location.outputs.parameters.location}}flat/'
+                  value: '{{=sprig.trimSuffix("/", tasks["get-location"].outputs.parameters.location)}}/flat/'
               artifacts:
                 - name: group_data
                   from: '{{ tasks.group.outputs.artifacts.output }}'
@@ -440,7 +442,7 @@ spec:
             arguments:
               parameters:
                 - name: uri
-                  value: '{{tasks.get-location.outputs.parameters.location}}flat/collection.json'
+                  value: '{{=sprig.trimSuffix("/", tasks["get-location"].outputs.parameters.location)}}/flat/collection.json'
               artifacts:
                 - name: stac-result
                   raw:
@@ -482,7 +484,7 @@ spec:
             arguments:
               parameters:
                 - name: source
-                  value: '{{tasks.get-location.outputs.parameters.location}}flat/'
+                  value: '{{=sprig.trimSuffix("/", tasks["get-location"].outputs.parameters.location)}}/flat/'
                 - name: target_bucket_name
                   value: '{{workflow.parameters.target_bucket_name}}'
                 - name: copy_option
@@ -505,6 +507,7 @@ spec:
         parameters:
           - name: group_id
           - name: collection_id
+          - name: current_datetime
           - name: target
         artifacts:
           - name: group_data
@@ -544,6 +547,10 @@ spec:
           - '{{=sprig.trim(workflow.parameters.target_epsg)}}'
           - '--gsd'
           - '{{=sprig.trim(workflow.parameters.gsd)}}'
+          - '--odr-url'
+          - '{{=sprig.trim(workflow.parameters.odr_url)}}'
+          - '--current-datetime'
+          - '{{inputs.parameters.current_datetime}}'
 
     - name: create-collection
       nodeSelector:
@@ -570,7 +577,7 @@ spec:
           - python
           - '/app/scripts/collection_from_items.py'
           - '--uri'
-          - '{{inputs.parameters.location}}flat/'
+          - '{{=sprig.trimSuffix("/", inputs.parameters.location)}}/flat/'
           - '--collection-id'
           - '{{inputs.parameters.collection_id}}'
           - '--linz-slug'
@@ -621,9 +628,9 @@ spec:
             '-V',
             'create-overview',
             '--source',
-            '{{inputs.parameters.location}}flat/',
+            '{{=sprig.trimSuffix("/", inputs.parameters.location)}}/flat/',
             '--output',
-            '{{inputs.parameters.location}}flat/',
+            '{{=sprig.trimSuffix("/", inputs.parameters.location)}}/flat/',
           ]
 
     - name: create-config
@@ -641,7 +648,7 @@ spec:
             value: s3://linz-bucket-config/config.basemaps.json
         args:
           - 'config'
-          - '{{ inputs.parameters.location }}flat/'
+          - '{{=sprig.trimSuffix("/", inputs.parameters.location)}}/flat/'
       outputs:
         parameters:
           - name: url
@@ -657,7 +664,7 @@ spec:
             path: '/tmp/cogify/config-url'
             s3:
               bucket: '{{inputs.parameters.bucket}}'
-              key: '{{inputs.parameters.key}}flat/config-url'
+              key: '{{=sprig.trimSuffix("/", inputs.parameters.key)}}/flat/config-url'
             archive:
               none: {}