Skip to content

Commit 81a1bab

Browse files
committed
fix: update workflow template for devseed-staging
- Remove mutex with unsupported expression syntax - Reduce memory requests (2Gi/1CPU for convert, down from 6Gi/2CPU) - Fix script execution: use bash command with python3 interpreter - Update image tag to feat-workflow-parallelism - Remove item_id parameter from sensor to match 2-step workflow
1 parent 6de37e1 commit 81a1bab

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

workflows/base/sensor.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,13 @@ spec:
3131
arguments:
3232
parameters:
3333
- name: source_url
34-
- name: item_id
3534
- name: register_collection
3635
parameters:
3736
- src:
3837
dependencyName: geozarr-event
3938
dataKey: body.source_url
4039
dest: spec.arguments.parameters.0.value
41-
- src:
42-
dependencyName: geozarr-event
43-
dataKey: body.item_id
44-
dest: spec.arguments.parameters.1.value
4540
- src:
4641
dependencyName: geozarr-event
4742
dataKey: body.collection
48-
dest: spec.arguments.parameters.2.value
43+
dest: spec.arguments.parameters.1.value

workflows/base/workflowtemplate.yaml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
- name: s3_output_prefix
3333
value: tests-output
3434
- name: pipeline_image_version
35-
value: fix-unit-tests
35+
value: feat-workflow-parallelism
3636
templates:
3737
- name: main
3838
dag:
@@ -46,22 +46,19 @@ spec:
4646

4747
- name: convert-geozarr
4848
activeDeadlineSeconds: 3600
49-
synchronization:
50-
mutex:
51-
name: "item-{{workflow.parameters.source_url | sha1sum | trunc 8}}"
5249
script:
5350
image: ghcr.io/eopf-explorer/data-pipeline:{{workflow.parameters.pipeline_image_version}}
5451
imagePullPolicy: Always
55-
command: [python]
52+
command: [bash]
5653
resources:
5754
requests:
58-
memory: 6Gi
59-
cpu: '2'
55+
memory: 2Gi
56+
cpu: '1'
6057
limits:
61-
memory: 8Gi
58+
memory: 4Gi
6259
cpu: '2'
6360
source: |
64-
/app/scripts/convert.py \
61+
python3 /app/scripts/convert.py \
6562
--source-url "{{workflow.parameters.source_url}}" \
6663
--collection "{{workflow.parameters.register_collection}}" \
6764
--s3-output-bucket "{{workflow.parameters.s3_output_bucket}}" \
@@ -91,7 +88,7 @@ spec:
9188
script:
9289
image: ghcr.io/eopf-explorer/data-pipeline:{{workflow.parameters.pipeline_image_version}}
9390
imagePullPolicy: Always
94-
command: [python]
91+
command: [bash]
9592
ports:
9693
- containerPort: 8000
9794
name: metrics
@@ -103,7 +100,7 @@ spec:
103100
memory: 2Gi
104101
cpu: '1'
105102
source: |
106-
/app/scripts/register.py \
103+
python3 /app/scripts/register.py \
107104
--source-url "{{workflow.parameters.source_url}}" \
108105
--collection "{{workflow.parameters.register_collection}}" \
109106
--stac-api-url "{{workflow.parameters.stac_api_url}}" \

0 commit comments

Comments
 (0)